Kindle vs Nook

I want to get an e-reader before I go back to China later this year (October-ish), and I still can't make up my mind...

Arguments for Kindle:
The reader is 2nd gen already, so less prone to be buggy. The prices of some paperbacks seem to be priced slightly less on Amazon than B&N (by about $.60 per book)

Arguments for Nook:
Supports PDFs (so I can import from Baen Free Library & public domain works) and external memory plugins. Nicer interactive interface.

The slight difference in battery life isn't as much of an issue, since I don't plan on using the built-in wireless. And no, I don't want to buy both since that would mean I have buy the individual books twice over too.

Decisions, decisions...