P0087 and the fact your hpfp is unable to make requested pressure puts my thinking right where we started...your tri-lobe on the cam is worn too much. Your hpfp piston is a bit worn as well unless you added a new hpfp, can't remember right now and don't want to go back and look. But I believe you said you have a new hpfp, is this true? If there isn't a loss of fuel pressure due to a leaky injector or a failed FPRV(rail pressure relief valve)...then its your intake cam and the wear on the tri-lobe.
I doubt it is the high or low pressure sensor failing because data for both sensors shows what the they are reporting. You can go ahead and replace the sensors if you like, but I believe you will eventually need to replace that intake cam. The data more than confirms that.