Sorry to hear about your issues - Hopefully, you get this figured out & leak-free & reliable.

I installed the Diesel Fuel Filter Kit ---> https://dieselfuelfilterkits.com/13_...ilter_kit.html - On my 2017 @ the 15K mile mark.

Due to the Aluminum Base & Aluminum CAT filter housing having issues with Galling, I switched to the Donaldson DBF5814 (Spin-On) Filter = No Galling problems now.
Install was decently straightforward & easy - with no issues - The fit & Quality of parts were the same as OEM. (Never one leak or reliability issue so far)

Best of luck with your situation & Keep Us Up to Date!

Quality Parts / Kits these days are getting to be a thing of the past! (I was Lucky with my selection)

Happy Holidays to You & Yours!