If I were you, I would have one USB stick which is your master copy. It's the one you use for everything, and you just take it with you when you change dwellings.
I don't understand why you have to merge any other data. Is it because you have files on the User drive? If so, I would dump them, and have all your files on the USB stick. That's the only drive you use.
Cheers,
Fred