Tornado Technologies may be worth a try. I know they do threading and related work on a number of firearms, including the Walther TPH. Link here. Just passing it along in the event it helps. Cheers.
That is the exact company I was planning on using. I hear good things about their work.