Bokkie--One thing my husband used to do was to have two operating hard drives for his laptop. He'd have the company sanctioned operating system on one, and his own build with everything he liked on the other. When ever he thought he might get his laptop "reviewed", etc. he'd swap out the hard drives.
Just a thought...
dordale