CaboVillas.com the owner is a good friend of mine.
They have Villas of all shapes and sizes as well as locations all over the Cabo area.
I've stayed at a bunch of their properties over the years and can recommend some if you'd like, just depends on your needs and tastes.
But this is my personal fav!
http://www.cabovillas.com/properties.asp?PID=169
Generally they are not that "Adult" friendly so keep that part to yourself if you're doing a shoot.
.