There are California coastal cruises for that. They should add some new ports La Paz (I know Carnival stops here occasionally on their 8 itinerary) Loreto, Guaymas, and Manzanillo.
This can be achieved by dropping (for this itinerary) PV and Mazatlan and adding La Paz and Loreto. And the following week drop Cabo and add Manzanillo or Guaymas.