sensitive headphone jack, power button non responsive

Hey

Sorry if this has been posted previously, but i couldn't find it.

My headphone jack is extremely sensitive. If i plug in headphones, and move the plug around just a little bit, the music will stop.

This might have been caused by wiggling the connector of my headphones around (whilst in my pocket).

Another problem i have (related?), is that my power button isn't responsive anymore. This happened gradually. First it worked fine, then only when i pushed hard (or maybe randomly, not sure), now it doesn't work at all anymore.

Do i have to replace this:

iPhone 3G/3GS Headphone Jack Assembly

using this guide:

iPhone 3G Headphone Jack Replacement

or might there be a simpler solution?

thanks in advance

Jeroen