my vote is for baja california too. Loreto or La paz. great options for summer. Lots of options. I got a really good deal in la paz at club cantamar, all inclusive, 3 tanks a day night dive optional.... but there are lots of places for all budgets there. consider also join the diving vessel nautillus explorer, they run trips from cabos or la paz in summer..
good luck.
good luck.