changing the headphone jack on an ibasso d10 amp

After a fair amount of use, it seems that the headphone jack on my ibasso d10 is starting to die. I assume it's a bad solder point since it's become sensitivity to any side force on the headphone plug, and there's some noticeable play in the jack.

I'm not sure if the warranty covers this or if ibasso will do the repair, but I figure this might be a good excuse to start another little DIY project.

Instead of just replacing the jack, I was thinking about soldering in a cable with an inline jack to prevent something like this from happening again (especially when I use headphones with larger 1/4" plugs). I'm fairly confident in my soldering abilities, but in no way an electrical engineer.

I'm a little confused by the solder points.

Here's the jack in question:

(jack with the plug)

From the bottom of the pcb:

(jack on the right)

Anyways, I see five solder point on the jack. I assume the single near the edge of the pcb is the ground with the two pairs being left and right signals? I think one out of each pair leads to resistors (trying to trace the path), to sense if anything is plugged in?

So the question is how do I solder this? Soldering the ground seems easy enough, do I have to do anything special about the signal pairs? Do I just go about it like this?

(sorry about the MSpaint, autocad makes me feel like I'm at work)

Do I have the right or idea, or have I just made myself look like an idiot in front of real EE's and modders?

And does anybody have any recommendations for good inline jacks? The cheap ones I grab from radioshack don't solder well (plastic separators melt under anything except for the fastest of soldering). I've had good experience with switchcraft plugs, but I'm not sure what their jacks are like. I don't want something ungodly huge; I'd rather be neat with my soldering and use something smaller.

so, being that they're switches... do I need to keep each pair separated when there isn't something plugged in? IE, I can't just short the two of them together like I have in my diagram? I should have assumed there was something special about that jack :/

If so, that makes things a little more complicated in trying to change it to a cabled inline jack.