You should wait until you can't possibly wait any longer.
I'm still holding out hope that the original, non-special edition versions will be included in some future box-set.
Even better is if we can choose to watch one or the other from the same disc...taking that further, it would be stupendous if we could customize our experience by picking and choosing which 'enhancements' of the SE versions we can turn off!