You could look for a more full coverage BB cream which you can just use for your foundation and sunscreen without it looking like you have tons of makeup on! Don't know how much you're looking to spend on one though, sephora and ulta sell a lot you could test out otherwise I know there are some at the drugstore but not sure what the coverage would be on those.

The new garnier BB cream for combo-oily skin is great, the coverage is really impressive but it looks/feels really light on your skin. You can build it up to full coverage as it does dry and 'set' so you can put another layer over and that works really well. The old formula had a lot of bad reviews and broke people out but the new version brought out earlier this year has countless good reviews. I havent used it long enough to say if it breaks me out but ill be really sad if it does because its a great product. Oh and its SPF 20 which is good for the beach as you want to keep your PIH protected from the sun

Well it is generally a no no, but try to get some sun at home before you go to Cabo- a little tan would be good before you go - and once there the sun and ocean salt water will be a good thing for your face.

As far as cover, I use Excuvience coverblend concealer, just on the spots before I hit the beach- 15 SPF and it does seem to hold up even after swimming, just let your face air dry, do not rub with a towel.

You could try a cc cream, basically the same thing as a bb cream only that the spf is much higher (around 20) and it covers really well. I use lumene cc cream, but since i live in sweden and lumene is a brand from finland i kinda doubt you'll find it in your store :/ Though i don't recommend using makeup at all.