Okay, great.
It sounds like the EFILive V2 would be a good option for you if you do intend to be able to make changes. It is a bit more expensive than HPTuners, but we would provide full tuning for you now and down the road at no additional cost.
Another option is the AutoCal, which is priced...