if you are definitely moving to windows7, and are willing to put up with the error messages until october/november, then waiting is probably the easiest route. i, on the other hand, wouldnt be able to sleep
try downloading the standalone sp1. if it doesnt work, you could request it on cd from microsoft.