Thanks for the answer, I'll do it just in two then.
Just in case i stupidly do something wrong....

Is good to know that there's no extra risk in having everything in 1 receiving address, vs different receiving address (in the new wallet).

My idea is to move to this new wallet encrypted and stick with this one from now. And keep the old wallet as a history wallet.