Looks like you have the bases covered. When I replaced the O-rings on my 02’ Marquis, never had another problem with air in the fuel system. Most people will say upgrade to a newer primary fuel system, but in my case, a few O-rings fixed the problem. Cheap fix if it works, if not, then spend the money to upgrade. Your call! Good luck!