The "definitive edition" has been announced for early august. I think you might want to stop the production until it releases - everyone who owns the original gets the definitive edition for free so everyone will have the new version. Would be better to build upon it for anything that can't just easily be translated over to the new version.
They said the changelog will include several thousand smaller bugfixes and changes including some major ones. Would waste a lot of your time to work on it now and translate it to the new version in two months.