If I knew my fuel was water contaminated I would start with draining off the bottom of the tank as Captain Dirty states, then use a Mr Funnel, then install a water block filter on the normal use pump.
The funnels are a great way to handle contaminated fuel, and some folks use them as a regular device while filling their machines. I don't have the patience to use them regularly though.