Amp change to 3pin plug should solve your problem. I never heard that changing a non compliant power plug could void your warranty.
2pin plugs are meant for country like US, the earth is at side of plug.
NOT COMPLIANT for Singapore power socket as we follow UK standard, remember we were once British colony, that's why we also right hand drive vehicles.
Nothing wrong wif your strat as single coil is more suseptable to noise as you need more gain on your amp to have same volume as humbuckers.
Regards,
Mike
Mikemann Music Studio