Its almostly certainly the second option.
The DHW gland will have leaked into the microswitch making the boiler think there is a demand for heat.
The gland and the switch will need to be replaced but that involves removing the gas valve so is a job for a CORGI.
Tony Glazier, August 2007