I swear by the Apeks tech shorts. Around 300 dives and 5 years and they are just now starting to break down and need to be replaced.
https://www.amazon.com/Apeks-Aqua-Shorts-Pocket-X-Large/dp/B00S8JMYA4