Problem is Texrat it has to be done as you well know, incidently did you notice just how small the pad is on the earth jacket to the pcb? if you look closely you will see the pads do not make contact with the main earthplain on the pcb, what i did to get a proper fix was to scrape off the paint on the main earthplain and join the tiny pads to the main earthplain, this makes the hold complete so it will not rip off the board no more as long as you use enough solder and also you can join this to the earth jacket very close to the usb socket making an even bigger fix.

Well done on your blog by the way, you really have done a lot of work even with Nokia on this one !.