If that happens in 2 months then oh well that's that and I'll have to deal with it.
Microsoft won't hold back on releasing OEM copies of Windows 7 because then we'll all have retail and that will then mean that people do have a reason to complain about the cost of windows (currently Vista costs are comparable to XP)
I really don't think this is a huge problem for Microsoft. I mean what percentage of PC's are built by enthusiasts? How many of those people will build another PC before Windows 7 is released. I personally think that rather than get the bad press Microsoft seems to have needlessly got with regards to Vista they are allowing people to transfer their licences.
At the end of the day we have 2 PC's at home and 2 licences for Vista. When I get a new PC I will buy a WHS licence and there will be three PC's and three licences for the OS's installed on those PC's.