My last resort is my mechanic who obviously has more knowledge in bike electricals than me

HealTech guys have been very supportive and they are even ready to replace my unit with the X-type indicator which is a bit more tedious to install. But before that I would want to make sure my unit doesn't work by any means..