Welcome back to the TP forum universe & welcome to the laid-back West!
You have quite the itinerary outside of Disney! I know you may have some awesome things planned in San Diego but as wonderful as San Diego is, I would always vote for another (even half day) at Disneyland over anything in San Diego. But I understand that your itinerary may not be flexible, so with that in mind, I’ve linked below a previous response I made to another poster asking for must-do’s with limited time in Disneyland. Your time may be even further limited, but at maybe the below will allow you to prioritize on what’s in the touring plan.
And without further ado, here is my 2 cents on the matter: Must-Do’s Unique to Disneyland Resort