I don't have as much solid roller experience as the other guys here, but I think you are a little light on spring pressure.
Mathematically, you started out at 240 installed / 568 open, certainly in the ballpark but seems like you are having control problems
With your keeper change, you should be at 247/576, not enough to make a difference IMHO, and the dyno showed it
You still have room for shims, at 1.36 (lash subtracted) open, you could go as much as .040 in shim, with .035 under there you'd end up at around 265 closed / 594 open, which seems like it would help keep the roller on the cam at high RPM.
Did you ever check the springs and see what they really were?
The other question is, do you redyno it?
Can't beg the buddy for one more set of pulls? Maybe a case of beer and a nap first and he'll get remotivated. Needless to say, if adding 30 lbs on the nose doesn't help, it probably is something else