Why are you going to buy another Windows machine, when you're not happy with the Windows experience now? And waiting for Windows 7, hoping that it's going to be better is not the best thing to do, as MS's track record has not been very good lately!
If you're open minded, go to an Apple store (Fairview, Yorkdale, Eaton Centre or Sherway) and try it out for yourself. The staff there would be pleased to answer all of your questions and take you for a spin. True, a Mac costs more than a Windows machine, but IMHO you get much more (quality of OS and software included such as the iLife suite....iPhoto, iWeb, Garageband, iDVD, iMovie), and you get a higher quality machine as well (Mac laptops are renowned for their precision hardware and design....example: unibody design from a single piece of aluminum). Apple just announced a price drop on their new Macbook pro line, with the 13 inch laptop added to their Pro line. The white Macbook is available for $1149.00 and it is a very nice laptop (same one that I own), and the 13 inch Pro (much higher quality design and graphics card) is going for only $1399.00.
If you're seriously interested in a Mac after checking them out, PM me as I have access to an Apple store employee discount site that brings you lower prices. This is the same Apple store designed for employees of a large bank with staff discounts. You have to order online and get free delivery, and you get the same warranty as buying it in store. The 13 inch white Macbook goes for $1080.00 and the 13 inch Macbook Pro goes for $1315.00, giving you $70 to $80 dollar discounts!