Armstrong Wavey Brake Discs

[old son]

I have a pair of these on my Gen 1. When I had EBC HH pads fitted the discs would 'ring' and this got quite loud under heavy braking. I have now fitted OEM pads and the discs 'grab' as the bike comes to a stop. Its driving me mad. I've put my original discs back on but they very slightly warped.

Has anybody any experience of Armstrong discs?

Does anybody know who the manufacturers/importers are?

Can I have my original discs skimmed?

Thanks