Maybe you can train with Luke Inman (
lukeinman.com) before you get on the boat? While I haven't met him in person nor seen him teach, I've heard very good things about his dive op from some equally retentive instructors like me.
An AOW course can be really valuable if the instructor requires you to master the skills instead of checking off that you completed them. When I taught in the PADI system, I chose the adventure dives (PPB, DSMB, and night). The PPB adventure dive was a gatekeeper. My student who is now getting a GUE technical fundies pass took about 5 tries before being allowed to continue on. If your buoyancy and trim are not of sufficient quality, the navigation, especially during the night dive, are going to be a mess.
And don't beat yourself up about a bad OW course. You don't know what you don't know. You and I could possible argue back and forth on who had the worse class! Oh the violations......