I chose AMD, and hope i am right that Hammer is going to be something different, if not my second choice will always be Intel unless VIA/Cryix does something reallly reallly amazing with their current chips.
Going to build auntie a (probably) xp1800 system to replace the god awful p3-450. Then I'll probably wait til Aug 25 when Intel's 2.8's are announced and build a 2.53 system for myself.