There are some gorgeous new hotels ( not all inclusive) very close to home in Cabo ..
We really feel in love with Las Ventanas
http://www.allaboutcabo.com/
go to hotels/resorts/villas, check out 5 and 6 star ratings on the "corridor"