Oh no... I should have read this thread first. I've got an E7 replacement for my really-carefully-looked-after N900, which went for warranty repair when the USB socket died.
Now trying to get sense out of Nokia UK and Ireland support - who seem to be in south-east Asia...
Happy to swap the brand new E7 for a new N900 if (when) dialogue breaks down (I'm in the UK). Will source an N9 as well - somehow, somewhere...