Andrade's gimmick is terrible and I'm sick of pretending otherwise

I adore Andrade as an in-ring performer, but my god this gimmick is making it really hard for me to watch him. I think it's so lame. Walking down to the ring with two nameless women in tight dresses as props is lame. The spot with a planted woman in the crowd who wants to take a picture with him (in EVERY MATCH) is even more lame. Every time he's on screen it's like he's holding a big neon sign that says "I had a very public divorce, recently." It sucks, and it genuinely is preventing me from being at all excited about this push he's getting.