Baja in summer could be hot. Baja in spring could be cold. Not super cold, but cold enough to require wetsuits. Winter is cold. In addition, if you are going to the Sea of Cortez, they have a peculiar wind from time to time.
So, my vote would be to go to BVI. Once you get more comfortable and want challenge, then go to Baja. BTW, I could share with you a couple of google "charts" and may be a place or two in BVI.