WTB: Threading and Soldering Help

Hi All,

So there is a couple of things I need done that are out of my area of expertise and I will pay for your time doing so and bothway shipping costs.

First is I need this threaded so that fits a Sanwu 3x beam expander. A 18650 battery next to it for size comparison. The hole is smaller than the battery so I think there is room for threading
https://imgur.com/a/OXNoY

Second I need the spring and the button locations switched because the batteries are actually in series but the holder was manufactured in parallel. My iron is only 25W so I can't do. The wire is pointing at which ones need to be switched.
https://imgur.com/a/PYEIW

Thank you,
H