I think I am going to go with Upsolute. I have been talking with Scott and they are going to do a new tune for me based on 93 octane as opposed to 91 which should be good for another 3 - 5 HP and TQ he said.

I should be going through with this next week.