Headlight switch , is it the cause? or the curse?

You mean the replacement terminals? I would get no14. The ammeter is larger (two of them) but you can solder larger wire into the no14 terminals "the way they are made"