I tried resoldering a few times and it while it worked the first time after that it still kept getting less reliable over time. The problem in mine was with the dimmer though.
I fitted a switch from a jap spec front cut, and it didnt have the dimmer at all. Works perfect, and im glad its got no dimmer, less chance of it shitting it again.