Help me find a new vacation spot in Mexico or Caribbean

[Dairylander]

I'm trying to find a new place for the annual vacation, here are the criteria:
-Close to a major airport, to keep the airline tickets cheap and travel time short. I'm flying out of Milwaukee/Chicago, so probably the gulf side of Mexico or Caribbean.
-I prefer clean and long waves, rather than super big. (and I'm an intermediate level regular footer)
-A flat, gently sloping beach break, so that the wife can surf inside the break.
-Variety of restaurants and shopping (again, for the wife).
-Hotel on the beach is a plus.
Tamarindo, Costa Rica was my old favorite, but it's too far to travel for a 5 day vacation, and it has gotten dirty in the past ten years, so I'm looking for some place closer with long, clean, year-round waves.
Some place more private is better than super touristy, but it has to be big enough for me to find a decent rental board.
I know I'm asking for a lot, so I don't expect to get everything.
Thanks for your suggestions.

[billie_morini]

Dairylander,
you should think long and hard about not going to Baja California, Mexico. This region has long served whale watchers, surfers, fisherman, other sportsmen, off road riders/drivers, and tourists. There has been increasing crime by Mexican Nationals on these visitors. It has sometimes violent and often scary. Sometimes "they" take your truck and leave you stuck. The California newspapers have had a lot of these stories in 2006 and 2007. Some stories tell of kayak and surf tour businesses that will not go there anymore after 8 to 20 years of business there. It's a shame, but I felt oblged to respond to your post.
Billie

[silversurfer]

well this may not be usefulll but here is where i go.......on my summer,spring break and maybe even this presidents week I have no school we my family drives over to grandmas in..MEXICO well its call baja california since its so close to the border...the best surf spot i been to was call k-58 or kilometro 58 in tijuana yea you could camp there and htere is just huge i mean huge shore line, there is plenty of space out there for everyone, the best thing is that there is bathrooms , resturants, showers and etc you just have to pay $10 once you get in