Hence, I am seriously considering switching back once Windows 7 comes out. I have been testdriving it a little bit on the MacBook ironically. So once I need new hardware, assuming Windows 7 is as good as I hope it will be (and have already experienced), I intend to keep my hardware options wide open. What is the point of having multiple operating systems on a machine when you can do everything you want on just one OS?
I'm sort of in your boat as well. I really, really love my Macbook Pro (13") but I've been playing with Windows 7 quite a bit and you know... it's not bad at all. I actually like it quite a bit. Have you been looking at any particular models/brands of Windows-based PCs? Curious as to what you think because I really love the build quality of my Macbook and I'm not sure if there are any PC manufacturers that come close except may Sony but bleh on them.