So you've almost completed a KO4 swap and wondering whether to go Bluefin Tuna 3 to tide you over before getting a map done by R-Tech?
Personally, I would just finish the hardware install and take it to R-Tech, or where ever. The unimpressive torque could be a fuel deficiency. Might be worth logging the lambda regulator channel to see if it's adding a lot of fuel in boost. If it is, you need a pump!