Probably one of these heatsinks will help those with dodgy 510 connectors. You only have to it fit once, then your tanks have a new thread to use.

Kepler & Other 510 Heatsinks