Okay GAF, I think I have a couple options as to how I want to upgrade this year, and it depends on whether or not my current desktop is still up to snuff.
My original plan was to get a new desktop and set it up as an HTPC for videos and gaming, and then somewhere down the line get a new laptop (preferably a MacBook) for work (and Diablo... and TF2). I currently use one desktop for both.
I just found out however that I can already connect my current desktop to my TV and pretty much convert it into an HTPC if I can just get my hands on a wireless USB mouse and keyboard (the system doesn't have bluetooth). It's a five-year-old Vista 32bit system with a Q6600 CPU and just 3GB of RAM, but I added an HD6850 last year so it can run almost all current games in 1080p. The only exception is The Witcher 2 which still maintains 30fps in 1080p.
So:
Option 1: Keep my current desktop as an HTPC and compliment it with a MacBook Pro this year.
Option 2: Get a new desktop as an HTPC for next gen gaming, keep the old desktop as a work system, and get the MacBook Pro much later down the line.
Also, I'd still like some suggestions for a wireless USB mouse and keyboard regardless.