It's a bit of a delusion at this point, but I hope this new movie prompts a re-release of the rated edition of the Blu-ray for the first movie. I've come to understand that the PG-13 version is better than the Unrated one, but for whatever reason finding that copy on Blu-ray is a real (expensive) pain.
Where are you getting this? The regular one-disc edition has the theatrical edition. It is literally just the first disc of the "mahogany" edition.