Yeah agreed - to answer my own question, if the atmospheric numbers were measured correctly then the SAE change should be fine. They use the older formula, so my calculator won't be exact, but using the newer J1349, you get:
Original test: SAE adjuted gives 369 wheel hp, which calculates as...