Hi Paul,
We dove with you back in 2017. It looks like you've added a lot more to your log than we have since then.
It's been a few years, but we've stayed and dove with both SCC and BA, multiple times. Regarding the shore diving at both, I'd say they are pretty comparable. We prefer to do most of those at night because of the different animals vs. day diving. You will see more or less the same stuff from one to the other. If I remember correctly, SCC has a slightly easier entry and you are submerged right away. BA you have to wade in then swim out just a little in very shallow water (unless jumping off the pier) but both are fine. The night diving at both is well worth it.
Both Sea of Cortez and Socorro are awesome! If you go to the SoC in the late summer and into fall, you will want to dive with sea lions. The juveniles are born around April, and the mothers will allow them to interact with divers. I even had one rest it's chin on the top of my head while it was lying on my tank/BC. Too bad I couldn't see that and had to rely on my wife's and others' description! These are some of the most memorable dives we've done. We also did Socorro on a liveaboard over Thanksgiving a few years back. Great trip, lots of sharks and mantas.
Glad to hear you got back to Coz and had a better experience this time.