So, I've been using the phone regularly ignoring the usb problem for more than a year and a half. Charged every day, maybe twice a day, never filed the charger pins or anything, just always tried not to apply any torque to the connector. I also have one or two bright spots on the screen that have been reportedly been fixed (screen replaced) under warranty.
I recently bought a seperate battery charger and two spare batteries so I can now stop using the usb for charging. Because the charger was faulty, and until I received the replacement I continued charging by usb and noticed that some times I had to pull the charger off and re-insert it to start charging. Also I think there is a little slack that wasn't there but that may just be a placebo.

Now I have three choices:

1. To stop using the usb charger and swap batteries. But what if it it comes off when connecting it to the computer just after warranty is over (January 2012)
2. To go to nokia care and request a replacement on the grounds of the white spots, and the shaky USB But what if they give me an E7, I don't want an E7...
3. Open it and glue it, while it's still on But then bye bye warranty (And I may mess it up, I have a history on that)

What do you suggest? What's the better choice