I've been to Cabo San Lucas and Puerto Vallarta. IMO PV beats Cabo hands down. Snag a condo rental on VRBO. Wal-mart is close and cheap to stock up on supplies. There are so many great restaraunts in PV and the charm is unmatched. You have the Sierra Madre mountains and Pacific Ocean right at your fingertips! The Malecon (oceanside "boardwalk") was just refurbished.

I will be in PV this upcoming week. Can't wait!!