I can't help with contractors but it might be worthwile considering the filtering, improving it.
SMX Multi-Stage Fuel Fueltration™ System Kits
Take a look at the Kit # 2 or Kit #3 which is simply installed ahead of your current Racor. The idea is these have much greater dirt holding capacity and are far easier to change.
Get one of the telltale vac. gauges so you can see if restriction is building which hopefully will give some warning that your filters are starting to plug.
Just for some thought. Even polishers cannot always get all the crud from your tank and another rough trip could result in the same [problem.