BHM took the car back, traced the fault and replaced the unit - I think the design may have been changed, but they are happy that all will now be sweetness and light (pun intended).
Under the 'belt and braces' approach, the spots have been moved to a different fuse (air con one was spare, of course). If all else fails, they'll get me to the hard shoulder, if not home...