Yes I believe that is the best bet. Be very careful as if you make it too high and you are in gear it will be like cruise control is stuck on. Make sure you are testing on a dyno and can put the car into neutral if required.
I'm not sure if the gearbox will stop you pulling it out of gear above a certain load, so increase it in small increments only.