I would STRONGLY recommend Manta! My wife & I are @ to use them for the 4th time. Small operation, so therefore can give a lot of personal attention (if you desire), but give you plenty of space, if they see you're experienced. Even w/a troublesome family of 4 (mom,dad,bro, & sis -- story for another time) to Cabo Pulmo, they kept their cool, both above & underwater. Kiki (especially -- most dives with) and Rodrigo (3-4 dives) are great, Master (boat cap'n) is cool, and Eran (owner) is busy (running a business is not always sunsets & margaritas!) and very personable as well. Very laid-back, relaxed diving style AND extremely competent. No worries!
Cabo Pulmo is (was - last year) great, and highly recommend that dive. The trip to the sea lion rookery @ Isla Espirito Santu is incredible! Two 1+ hr dives (15-20') w/sea lions tugging on your fins, fetching rocks, etc.
I'm jealous you're going before me! I might quit my job, so I can leave sooner!
Have fun!