I have not forgotten your requests.
ZPower do replica tank badges at £16 each but they are for the B models.
There is another supplier I am trying to track down who also does many other bits including ignition switches (as do ZPower) which I have used and can recommend but again mainly for the B models..
Are you still on a standard 6 pin CSR switch? I know one or two people have used the aftermarket ones and they do appear to be fine.
Also I assume that you are wanting CSR tank badges.