IN SHA ALLAH it will get fixed soon. Just visit any yamaha mechanic who is dealing with 4t bikes. Old mechanic of 2t yamaha have diff logics and a 2 year old mechanic of yamaha have different logics to track the issue. Wish you all the best.
Btw what about rust issue?