Ibuypower. From what I have read ABS has very good ratings, but its not enough of a difference to make me wait, especially since there is set no date when the upgraded F2 is making its debut that I know of.
Performance increase from 5400 to 7200 RPM is minimal and I do not plan to do any hard drive intensive activities so I cannot really justify getting it. And as for the 2.0 dothan, this baby has to last me 4 years and I cannot really see...