I can't imagine a mechanic swapping PROMS, unless he had access to a program and installed it into the new "chip". That swap biz, I've never heard of before. (BUT! Then again, I am not aware of anyone who's taken their Z to a dealer/mechanic either!
I favor the DYNOJET test route. We've got LOTS of graphs to compare with.
BTW.. I think you might just be spoiled. A C6 ZO6 is lighter and makes 100+ (peak) hp more and a ton more torque (mid-range) at the crank than your ZR-1. So,
seat of the pants would favor the C6 (427 vs. 350!) and be no surprise there.
On the other hand, a fully ported 5.7L LT5 w/ headers, "X" pipe and a tune can make 510 crank hp at around 6800 rpm. The results on a straightaway might just surprise an LS7 C6 Z06!