The 2015 Blu-Ray is solid, probably the best one out there and it has both cuts on the disc.
I used to like the extended cut but over time I’ve come to prefer the pacing of the theatrical. One of these days I’d like to do a hybrid cut with just a couple of extended cut scenes restored…
(FYI I’m talking about the primary extended cut; the Easter Egg one has the cheesy alternate ending, I think.)