That is no fun! Hopefully you can get it cleaned out and get it running again. As for a filter and water separator, I like these.
Bass Pro Shops® Fuel Filter/Water Separator Kit | Bass Pro Shops
They are much easier to maintain/change than the inline filters plus they are much better filters in my opinion.