I'm gonna advice you to wait till the new version drops. A lot of us are not doing anything major to our sites now because we know we will have to maybe do a fresh installation of the new version as soon as it is released. Just wait it out, shouldn't be that long anymore.