I would take Grand Solmar if I could get it without AI. From Grand Solmar you are so close to many restaurants. I like watching sunset better than sunrise is another reason. With all of the people we had going to Cabo I bet our AI would have been $1200+ a day or about $15,000 for the two weeks.
Vista Encantada is pretty nice and was AI non-mandatory. There is one restaurant near the pool with a great view and fantastic food. If you have a car you can valet park at Fiesta Marina Resort. You would need to take a golf cart to the resort gate to leave using Uber but Uber can bring you all the way back. Taxi's can come and go.
Bill