Both tests appear to be an improvement. Did you read the troubleshooting blog? It will help you understand how the system works. You still arent running up to about 1850psi and the drop in the second test is weird. You are on the right track, but the HPFP service could be next on your list. A rebuild kit isnt expensive, and will never be a waste of money.
edit: what Cfold said.
edit: what Cfold said.