Agree with Bob here. There is no reason to take more classes with more advanced dives until you have the basics down pat. And I agree with Lynne. You should not be taking an advanced class until your other issues are resolved. There is a marketing ploy that taking AOW right after OW is a good idea because it's 5 more dives with an instructor. If your basic skills are not down that is all it is - a marketing ploy.
An advanced class should give you more skills that will use your basics as a foundation. I do one class that I recommend to students who have decent basic skills but still need a little work on buoyancy, trim, buddy skills, and developing good judgment. That class is the UW Nav class I wrote. It does not need to be done deep and places heavy emphasis on buoyancy, trim, communication, and buddy procedures.
For some of my students the progression is OW, 10 dives, UW Nav, another 10 dives, Rescue, another 10 dives then AOW. If done this way I still do the Nav dive as it is required but will change it to a more complicated course and a few extra skills. I require the 10 dives between my courses to allow the diver time to actually practice the skills they have learned before loading them up with new ones.