maemo.org - Talk - E7 charging port broken (arrgh!)

I know this is not a Symbian or E7 forum, but bear with me.

Last year, I sent my broken N900 (the USB port had stopped working) into a third-party shop that repairs/replaces Nokia phones under warranty. They charged me €15 at the time (what I didn't realise was if I sent the phone into a Nokia Care Point, there would have been no charge). Needless to say, I got fobbed off with an E7 which in hindsight I should have refused (it's a piece of junk!). Fast forward to today (9 months or so later) and the USB port of my E7 is barely working (usually a sign it's about to pack in altogether).

What are my options? Do I have a 2 year warranty on my replacement device? Can I get a replacement/repair on a phone that was already a replacement for another phone? If the repair is deemed uneconomical, do they replace an E7 with an E7, or could I possibly get an N9 or N8 instead (I really, really have started to hate the E7). When I got my E7, I was just given the device and 2 cables, the proof of purchase was sent in with my N900 was never returned - what happens in the case?

I am based in Ireland by the way. Any help, advice or previous experiences would be helpful, thanks.