Good luck with the purchase. I bought mine on eBay too.

Are you in the UK? Either way I wonder if you could help out with information needed to reproduce the 1.6 Keyboard?
http://android.modaco.com/content/de.../1-6-keyboard/
The rest of us appear to have upgraded to 2.1 already and miss the old keyboard layout. It would be great to have the choice to revert to it.