Finally got to my scheduled dyno session. These numbers seem to make a lot more sense to me.
I know I said I wanted to do things before/after modding but I kind of cheated here. All dyno runs are after an HKS intake and JB4 but I believe the gains to be negligible for intakes. Blue run is base (map 0), green and red are JB4 maps 2 and 3 respectively.