I know what you mean. I try not to upgrade in the middle of a project, but I don't have any other suggestion for your displacement.
If you upgrade, just be sure to read the release notes for driver requirements etc. I see lots of posts here of people that have issues on windows 10.
The FB group is very active, perhaps someone there has an alternative solution