I'm currently having serious water ingestion issues with my FX1. It came with a R&D Pro Flow with outerwears. Any time I'm in large waves, or sub I gulp water and takes 1+ minute to recover. I wish I had the stock arrestor. Any suggestions? Is stock the best, or anything aftermarket that's better?