For the price of the stocker, yes the Kisan is a good bet. However, I would still be hesitant to apply an upgrade to a circuit that may still have problems.
If the dash light issue isn't resolved first, who knows how it will react with a Kisan. Of course the Kisan introduces it's own issue with the single dash indicator...
Current: 93 R100GS, 03 XR650R
Prior: 73 CB350, 77 R100/7, 83 R100RT, 04 XR650L
I love every motorcycle I've owned and even some that I haven't.