2014 Scrambler Won't Start

Hi all, first time posting:

I have a 2014 Scrambler. I have had it out a few times this year and just replaced the battery.

It started great today and went to fuel up a tank that was mostly empty. (Light was on).

I made it 5 miles down the road when cars cut in front of me and I quickly downshifted and braked. The bike stalled out and I couldn't get it started. I pulled into a gas station and the mechanic there said it sounds like a fuel delivery issue.

Sooooo.....

My working hypothesis is fuel filter. It sounds like it wants to start but never really catches. I'm assuming this calls for taking off the tank and changing out the filter, and the gasket.

Before I go down this road, I thought I would post this in case anybody wants to offer advice (do I need to change the hoses connecting the filter too?) or any further troubleshooting tips.

Thanks in advance!