I was going to suggest mr funnel too, but you beat me to it. but your statement if about not adding water dispersants bothers me. I admit, I dont use mr funnel on my BX, but you got me thinking. what would happen to either cases .
I just researched a little on mr funnel and power service. on mr funnel website it says :Fuel additives and stabilizers may allow water to pass through filter. Add additives directly to tank. I always add PS to the tank anyways. To the OP - it might be a good idea to get a mr funnel if you havent used a additive yet in the can.