The HPFP was the issue and fixed under the extended warranty at no charge. Unfortunately I had a leaky water pump as well that was not covered.
Thanks for helping getting me pointed in the right direction. I probably would have ended up getting myself stuck somewhere if I didn't get on this.