Fuel filter adapter

[DB1970]

Has anyone found or fabricated a spin on fuel filter to replace the cartridge filter? I've been studying the connectors and tubing and found an adapter that comes close, but can't figure out what to do with the WIF sensor. Any ideas, or am I just running down an endless rabbit hole? I've recently bought a 2019 model and have been looking for ways to become less reliant on parts from India.

 

[Uncle Chuck]

FYI, I feel the same way. What with some possible tariff issues with India, this only compounds the potential problem.
If anybody comes up with a good spin-on solution, I'm in!