I found a Buffalo WHR-HP-G54, and while it has no draft-N support, it DOES support the dd-wrt firmware flawlessly - more features that I can imagine.
Built-in amplifier, flash card support, NFS file mounting support, Intel WiFi or whatever compliant, all the good stuff.
I last saw it on...