I'll try rewiring my current setup, and then go from there, I'm a bit nervous about doing it incase I make it worse but I'll give it a go. And then if that doesn't work I'll have a look at getting new keystone jack, annoyingly they seem to be quite difficult to get hold of in the UK!