I feel so badly for you but we ended up with a situation with AF too and ended up going off resort completely. All of our renewal things are now right in PDC. The site allowed me to book the location and time I wanted but then 10 days later came back and said it shouldn't have allowed me to do that. I walked away from the deposit after a week of really frustrating conversations wit them. I'm thrilled with what we have now.
As to resorts, as the other girls have suggested there are quite a few that might be able to give you what you're looking for. Are you in the US or Canada? That will also determine what you get included and what you don't as generally they're different depending on where you are. Have you looked at the Princess resorts? We're looking now at Platinum Yucatsn Princess which is the adults only section of the three. I know there is a bride here that has a gorgeous setup going on for her wedding and from what she has posted the price point seems white reasonable. I think she is using grand riviera princess. It's not that far from all the nightlife of Playa del Carmen or day trips to the ruins and cenotes if that's what. You would like. Then of course there is the great shopping in PDC. Palace resorts are also popular. There are the 2 Grand Sirenis resorts, Valentin Imperial. I haven't heard a lot of good things about the Rius only from the nickel and diming perspective.
I know you have a TA but have you contacted the administrators of this site- Wright Travel? Even just to ask them questions? They are top award winners in several of the top chains and I'm sure they could point you in a direction that might help you out! I hope you find something that works for you! Good luck!