So I guess it's computer upgrade time. I've not kept up to date with the latest and greatest, so I'm hoping for some advice here. I'm looking for at least dual core (but preferably quad core), the ability to throw in at least 8GB of RAM, PCIe 2.0, and if at all possible, EFI. My DVD+-RW DL is still PATA, so that would be nice but I can always upgrade that to SATA if needed, or throw in an old PATA card I'm sure I have laying around somewhere. Onboard audio and gigabit ethernet would also be nice, but aren't required. I'm not at all a gamer anymore, so don't really need SLI support. I only plan on running linux, openbsd, and my own OS on this beast. I'll of course also test other hobbyist OS's, but Windows won't be getting to touch this machine.
The little bit of research I did tonight has me leaning toward the Core i7 over my traditional choice of AMD processors. I also prefer to use hardware that has documentation available for it, but I'm not going to be super stingy on that.
Price does matter, but I've not yet figured out my budget either, so pretty much any suggestions would be welcome. I'm also interested in opinions on vendor/manufacturer as well and any experiences you may have with getting warranty support or otherwise dealing with the vendor or manufacturer.
I don't need to buy anything right away, so I may just end up waiting for the Core i7 to gain MP support as well. Although I figure with Christmas coming and nothing else to put on my wishlist, a couple of parts would at least be something to give the wife something to shop for.

Thanks in advance for all your suggestions!