Not sure if he's still doing it or not but allegedly we have a great gunsmith called Dave Welham not too far away. I haven't dealt with him personally but someone told me he's one of the most respected PCP gunsmiths in the UK.