I am trying to decide between Cabo & Puerto Vallarta

I have hotel/air booked to PV but am debating changing to Cabo since I am kinda forced to stay 5 nights in PV because of air, which I think maybe a little overkill in PV.
Actually going next week, no cruise this time.

Thanks a lot. As always, your information is very detailed and helpful.