2006 Yamaha T50TLR 4 stroke with EFI that will run for up to 40 minutes and then stall

Have a 2006 Yamaha T50TLR 4 stroke with EFI that will run for up to 40 minutes and then stall out and not start. If you let the engine sit for a while it will start back up after it cools down. We have replaced the low pressure fuel pump and replaced the fuel lines but still have the same results. The next step is to replace the high pressure fuel pump. I know there was a fuel restriction issue with some Honda 50hp 4 strokes that involved a grommet on the high pressure fuel pump expanding or bloating after running for 20 minutes or so and blocking off the flow of fuel to the engine and causing a stall condition. The configuration is almost the same on these motors as the Honda but the part is called a pump damper on the Yamaha. Has this been identified as an issue on Yamaha 4 stroke EFI models. I hate to spend over $300 on a high pressure fuel pump if the damper or grommet is the issue. Best time of the year to be on the water and hoping to get boat running right.. . .

Update: I replaced the gas line from tank, primer bulb, gas line fitting, and fuel filter. The fuel filter was the original and was definitely in need of replacing. There was some debris in the bottom of the fuel filter bowl that I cleaned out. I added 6 gallons of recreation fuel and she ran great for an hour and a half and is running great ever since. Sure glad it wasn't the high pressure pump. Life is good