You can try creating a ghost image of your current build, then transferring it over to the new hardware.
Ensure that you backup all personal files and data and check it twice.
If this was me - I would bite the bullet and reinstall. It is just the safer and cleaner option.
And while it initially may have taken a while to get things working - that was your first go-around.
Reinstalls often start out long when you first do it, but as you remember and gain practice, they get easier and easier.
And you can reference here, as well: