Start with basics... When it bogs, pull the primary fuel filter and carefully (i.e. while hanging over the side, don't want fuel fumes in bilge) pour contents into a glass jar. Check to see if water seperates out over 10 to 15 mins. Run bilge blower for 10 mins before attempting a restart. If mechanic checked out fuel flow while engine was running OK ( doesn't it always when you get it to a mechanic???) and it was OK, nothing was proved or disproved.
When I pull my fuel filter seperator to check for water, I always smear a thin film of engine oil on the rubber gasket on the filter b4 reinstalling. In these days of ethanol laced fuel, investment in a filter wrench is money well spent. I've found that the type that fits on a 3/8 rachet drive and fits the top of the filter as a cap to be better than the band type... They are available at most good auto parts stores. Make sure you get the right size for your filter. I don't have a lot of clearance under my filter, so I have to remove the wrench ( I have to pop the 3/8 drive off the cap wrench first) as soon as filter comes loose a full turn.