retail, yes but you need to decommission the previous.
OEM needs to stay with the build.
I've had to re-establish after major changes, and never had any resistance.
As long as it isn't more than one box at a time, they don't give you a hard time.
of course, I don't describe it as a replacement build, just replacement parts, so that might help.