Is the fuel leak from the underside....small tube on the right front of eng?
Kinda hard to see.....most add a small section of rubber tubing to extend it and allow easier collection ....instead of getting fuel all over the frame.
When you "drained the water" , did you make sure the yellow tab returned completly to the closed position?
Did you replace the square seal ring on the cap and make sure it sits square ....
Did you use just a replacement filter or get one of the "filter/cap" combos....they are prone to
....