Alternative to Speedo Endurance Jammer?

I am looking for recommendation for a swimsuit. I was using regular nylon TYR jammers for a while but they were wearing out too quickly. I switched to the Endurance Jammer last year and it has held up well, but is uncomfortable. The elastic at the bottom is too tight and the waist is too big. I can tighten the waist, but the elastic on the legs never stretched out. I tried on a size larger, but they are too baggy everywhere else.

I like how well it has held up, but I am finally deciding to replace it because it is that uncomfortable. I am considering square shorts, or maybe TYR’s version of the endurance suit. I just thought I would ask in the event that others have run into this same thing.

Short version - recommendations on a long lasting, comfortable suit?

I switched to the endurance square leg from the jammer this year. Square leg is a lot more comfy.

I also switched to the square leg suit. Better but still pretty tight on the legs.

There’s only one choice, speedo polymesh square leg.