if you are sure all the water is out,tank etc.,replace oil filter,pump strainer,and nozzle,you might want this done by a serviceman,tell him or her about the water.
old guy, February 2009
edit
I can answer this question...
Oil boiler has water in the feed from tank. how can i get it out?