Good fuel filter, lift pump?
Try the following changes,
-In B1021 only allow 2 injection events from about 2800rpm on up from 7v to 17v.
-Try changing your max and minimum pressure control duty cycles to 100 and 0.
-Taper B1015 current down to 0 in the last third of the column.