Thanks Gasguru, i did as you said and was getting hot water constantly so it looks like the diverter.
Rob884, i am not sure if you are talking about the same boiler as after draining i can remove the valve in about 5-10 mins easy. If you have not removed it in a long time you can have...