Are you really planning on opening up the phone to get the battery out every time you want to charge it directly?

I reckon you should try getting the USB port fixed again or try the wireless charging mod http://talk.maemo.org/showthread.php?t=84916