Update-

Queretaro was fantastic!. A pretty wealthy place, and we really enjoyed it. Regarding airlines, I would suggest stick to the Aeromexico or Aeromar as we saw horribly long lines on the others even at the gates, disorderly mess, just a free for all at the gates. We also did a recent trip all over Mexico -from PVR to Merida to Puebla and to Cancun. All were great except Cancun
Whilst on Cancun-some thoughts--
There is a taxi mafia that controls Cancun and they do not allow Uber to come near the airport or hotels. If you order Uber at a hotel, be discreet, sit in the front, act like it is your freind/relative. We were told by Uber drivers that they have been threatened by machetes by taxi drivers
On all accounts, avoid Comfort Inn at the Cancun Airport-it is a mess...the taxi mafia is very active there, the lobby is a mess, there is no breakfast, they fleece you off $$$$ and they will not give you a shuttle to the airport (they made some excuse and then we saw them harassing a woman for money to take her to the airport ). In addition the lobby is run by a few guys who have a counter there and are trying to sell all sorts of tours/extras very aggressively. The whole place is being run as though a group of people have taken over it. We were really glad we did not stay there for more than a night.
Regarding Airlines, we were quite happy with Aeromexico but we had to check in and pay for a bag ($30) even though we are Aviator card holders. We will be canceling that card soon.