Starting to feel a bit more normal today, so set about trying to sort a few gremlins out.
Screen wash wasn't working, so after a bit of investigation it turned out that there's a non return valve that had been fitted the wrong way around when the garage fitted my bonnet... No big deal, but I do need to replace a few of the fittings as there's a couple of leaks and snapped clips.
Grant had done the JDM stalk swap, which I'm pretty pleased about as it's the right way around, but the rear wipers weren't working. I thought easiest thing would be to swap my old stalks on, so whipped them off tubs, and went to fit them, then noticed that the plug for the rears wasn't connected... So I snipped some cable off the loom in tubs and extended the plug to reach the other side - job done. This also seems to have stopped the horn sounding when the fog lights are turned on, but now the front fog lights don't seem to want to stay on when you press the switch.