Ok, seems that the problem wasn't with the fuel shutoff solenoid. The engine started acting up again last week-end and this week. In the last couple of days, It's been hard to start, but as soon as it catches, it runs good. Sometimes after 30 seconds, it would just die, but start right back up. If I left it for 10 minutes, like picking up the kids at daycare, it would need 10-15 seconds of cranking to start. Seems that the problem is still fuel related. Last week I changed the glow plugs, controller and glow harness. This week I changed the fuel filter. I don't have a fuel pressure gauge, so I just went ahead and replaced the lift pump also since I had one on hand. Now I have good flow at air purge and water drain. I can hear the LP running when I turn the key, and when I stop cranking, it keeps going 3 or 4 seconds until oil pressure drops back to zero. The starter spins the engine fast, but it won't smoke or cough like an engine that's too cold or too slow to catch. It's just not getting fuel. I even tried cracking an injector line to check for fuel and got nothing. So that means that I may have a bad FSD or a bad IP. I'm going to take the FSD out of the bumper and try it direct on the IP harness to test if the extension is the culprit. If it still won't start, I'll have to order a PMD as I don't have a spare.
I'll post back with results later.