UPDATE: Dead HPFP on 2011 JSW

TL:DR; Got an entire new fuel system courtesy of dieselgate warranty.

Got my car back from the dealer today. The HPFP was indeed dead. They diagnosed the problem the same way users here said to: pull the solenoid off the HPFP and look for glitter.

The dealer suggested thousands of dollars for 'maintenance items' that were priced 2 to 5 times what a private mechanic would charge. (like $170 for a cabin air filter, and $560 for sway bar end links). I declined to have the dealer fix those, and instead ordered them from rockauto the same day.

All said and done, I am reasonably happy with the way the dealership handled this. They didn't make me sweat it. From the very first appointment, they were very matter-of-fact that if the HPFP was dead, it's covered under warranty... and then they stood by their word, fixed the car and gave it back with no hassle.

The real concern is owning this car out of warranty. I get the feeling that the HPFP is just a ticking time bomb, considering the absolutely perfect maintenance history on this particular vehicle. Hard to believe it ate itself at under 100,000 miles... but that's exactly what happened. I wish there was an easy way to bulletproof the HPFP.