I will second the margaritas at La Hacienda de San Angel. Really really good. Best I've ever had
I will also suggest the margarita cart at he boardwalk. Sit on the boardwalk, get some ice cream from Ample Hills, and have some drinks. Its really nice.
The real reason I am replying, though, is for Disney springs.
The drinks at Homecomin are amazing. Be careful, though, they are strong and you don't realize it. I can really handle my alcohol. I had three of their Sweet Tea moonshines, and when I stood up I was a little whoozy. I can easily drink a lot more drinks at a regular bar. They also have an apple pie ( I think) drink that was really good.
Another suggestion, not so much for the drink, but the view, top deck of paddlefish. Such a nice view up there. One a nice night - wow