It sounds like you have stability problems, not buoyancy problems. Until you feel stable in the water, everything else is a challenge.
I would recommend private classes with a different instructor, preferably one that emphasizes neutral buoyancy and proper trim from the outset. If you have to...