@Zinman, you are one of very few divers with less dives than me. I'm really new, so I can definitely relate to what you're experiencing. Right now, my buoyancy breathing kind of sucks and my sac rate is probably abysmal. I, like you, was yoyo'ing in the water and I had trouble staying a depth near the end of a dive.
Here are the things that made a huge difference for me:
-Properly venting my BC (a wing in my case) by assuming the proper body position. And adding/releasing air in tiny increments patiently waiting for the resultant change.
-Relaxing. Somehow, I got 5-10 lbs more negatively buoyant when I quit tensing up and thrashing around.
-Steel tank. I had been renting or borrowing an AL80. But when I bought an HP100, it was like magic both for my trim and buoyancy, especially toward the end of a dive.
-Help from my diving buddies. I was struggling to plane out on a dive, when my buddy signaled me over to a rock at 30 feet depth and I just held on until I got my buoyance dialed in and had a great dive for the remaining 45 minutes.
My biggest problem now is that I don't get to dive enough. You'll get it figured out.