I did the same, but since all my hobbies have changed for 2010, I have gone all Macintosh. I wanted a computer that was like an appliance, if Microsoft made TV's you would have the back off it all the time tweaking pots, I wanted a machine that turned on - shut down and worked !! Macintosh has done that for me, so much so that I bought 3 of them, Mac mini's, I know that are not the most powerful mac out there but the new Snow Leopard is very nippy.
Small form factor and does everything a pc does - better
(except video editing) - coz I don't know how to work the much more powerful software - lol