can anyone recommend a good metric tap/die set so i can clear out the threads for reassembly?
Here's a nice set from SnapOn. And reasonably priced, too:
RTD15M, Tap & Die Set, Metric, Rethreading
Note these are for "renewing existing threads", not cutting new ones which is exactly what you want. If you pay the dealer cash you may receive a discount.