Ford 6.7L Power Stroke Diesel :: Whining Sound / Low Fuel Pressure And Reduced Power Warning - Fuel Pump Just Died

So, I just had the fuel pump replaced on my '15 6.7 a month ago and it just died again. (next day edit: it didn't actually die, it showed all the same symptoms)

Same symptoms: whining sound, low fuel pressure warning, reduced power warning.

This time I'm 50 miles from home so I pulled off the road before it shut off. Interesting, I was in a hilly area and my low fuel warning came on too. We are waiting for a tow. I was considering trying to push on but don't want to get stuck in a dangerous spot on the highway. We're in a church parking lot.

So, last time this happened I was on flat road with about a half tank of fuel on a lunch break. I ran a mile after the warnings came on to feel out the issue and to see what would happen. I happened to be only about a mile away from my dealer so I drove that way. I got reduced power warning and then it cut power on me (limp mode). I made it to about 100 yards away before it cut off.

This time, I was in a hilly area at night on a windy two lane road with no shoulders in the woods. I was miles from civilization and was showing below a quarter tank of fuel. ~100 miles to EMPTY. I got the low fuel pressure warning first and then the reduced power mode before the whining noise started. I was climbing a hill on a curve at the time. I drove a quarter mile and then pulled off the road into a parking lot so I wouldn't be stuck on the shoulder. It didn't actually go into limp mode.

I let it sit a few minutes, talked it over with the wife and decided to call for a tow. After talking to the tow truck driver who said he would be an hour because he had to go find a bigger truck, I decided to see what I could do while I wait. I fired it back up and the fuel level dropped to below 1/8 and I was now showing 33 miles to EMPTY. I was parked on a hill with the back end up. I had backed the truck into a space to make it easier for the tow truck driver. I let it run a minute, checked for leaks and it seemed to run fine with no studdering or additional warning lights.

CEL was on but no new warnings. I put in my code reader and pulled the P0087. Just one code. I revved it a bit to see if there were any issues. It seemed fine so I decided to try my luck. I started driving towards home with the intention to stop at the first diesel station to fill up. Truck ran fine. After two minutes of driving gently, heart racing, my fuel level came back up and it now read 88 miles to EMPTY. I drove 11 miles to the nearest station and filled up. No issues. I shut it down. I fired it back up. Still no issues so with a full tank, I drove home the remaining 30 miles without issue.

Planning to take it in to the dealer Monday to get it checked. Could this be from an air pocked due to low fuel level and hilly terrain? Is my new pump dying already? Is there something else going on inside the tank or elsewhere?