20 will be ok, providing you don't run around on full boost all day
There's a guy down in Somerset who does some amazing remaps for our cars, £220 will get you a map that should be worth 150bhp + 230lb-ft with your modifications
I'll find his URL in a min