If it were us (and it was, once), I would check in at Ensenada. We checked in with the help of the very friendly staff at Cruiseport Marina in 2015. I know, this info is now dated. However, in November of 2019, some friends of our got scammed by the staff at the other marina and ended up paying an exorbitant amount for their "help" to check in.
The key word in your question was "plan". You may not "plan" to stop before you get to PV, but you may very well have to.
In case you haven't heard this before: "The worst thing a sailor can have is a plan."
Wishing you the best of luck! It will be an experience you'll never forget.