I have been having this issue as well. I found for my R31 CB the problem was a bad engine battery. I have now changed the battery and no more water in fuel alarms. I am at the Ranger Tug Rendezvous and attended the Volvo Penta D4 seminar and it was confirmed that low voltage can send erroneous alarms. This may not be your issue but it sure was mine. Good luck!