Re the heater it'll probably be the contact on the back of the switch, get one from a breakers, they're all the same.
Next mod would probably be a chip so you can up the boost or a big 'cooler if you haven't got one already.