Should I upgrade before or after the April 2018 upgrade arrives?

Do a system image tonight, then tomorrow afternoon use the Media Creation Tool and save the iso for Windows 10 1803 on a flash drive. Then do a clean install with it.
Before you do the clean install make sure you have a backup of your pc, a system image, any upgraded drivers for your laptop for Windows 10.
After that's all done do a clean install of Windows 10.
That's probably where your previous issues were from doing a upgrade install from 7 to 10.
Never do a upgrade install from one version of Windows to a newer version, you'll have issues.

Thanks to all for the advice and helpful suggestions.

BRKKAB said:

...Never do a upgrade install from one version of Windows to a newer version, you'll have issues.

Over-generalization!

I "upgraded" 7 different PCs from Win7 to Win10 and six of them worked fine. The only one that had problems was a really old PC that I had upgraded from XP.

Later, when the FCU came out, one of the six failed that upgrade, so I restored it. But then, when MS offered the FCU through their special disability option, I ran the upgrade again and it worked.

I always wait at least 3 months before doing a feature update to give Microsoft a chance to iron out the inevitable bugs in their wonky software engineering development.

i have already installed and today reverted to the last win 10 installation due to a slowness to load the system and start page plus odd little bits like pages loading just by running over a part of the screen with the curser, so I would say don't rush it, it was easy for me to revert but not sure it would be for your system.

I have done two clean installations on two different pcs. No issues so far.