Water can flame out a FID. Installing a jet with a bigger hole in it (0.8 mm) might do the trick. This is the Shimadzu solution.
Did you measure the gasflows on the FID itself?