Hi Alex,
OK, the Club may not have a lot of bits for the G31, but they used to stock the taps and dies you want - and £15 for a year's membership is a bargain. I bet you have already spent a lot more than that in your unsuccessful attempts to get parts made!! Also, once you become a member, you have access to help from individual members as well!
Regards,
Eddie.