One more update....
So I got to the dock, got boat in the water started right up and I proceed to head out. Got maybe 100' from the dock and right back to where I started - motor shut off. So on the external tank no issues, connect to the inboard tank won't run. Spin off the water/fuel separator, crap load of water and not so much gas. The filter's only 3-5 months old and fuel not even that old. Was put in just before the hurricanes, So got it cleared out (mostly i think) and seems to be running ok. I still think i might have an air leak on the OMS side as the no-oil alarm went off again briefly.