You should check out sysprep from microsoft. At least on XP, it will allow you to painlessly switch MBs... You run it, turn the machine off, do the swap and when you turn it on, it detects all new devices, just like if you had bought it from Dell or the like.
Very, very cool! search for sysprep on microsoft.com
Art