first place I would check is the headlights for water corrosion on the multiplugs on the back of the headlight units.. if not there check where the black earth cables mount to the chassis (ground)
If to no avail then would whip the steering wheel off and look at the boss/stalks behind the steering wheel, I know this is a bit more fiddly BUT....I had a very similar problem when I replaced the power steering box on my GP. Immediately after changing, the indicators wouldn't self cancel and MB flashed when the indicators were on. Turned out to be a few of the pins on their metal contact counterparts were out of sync.