It's probably not worth changing the gearing just yet, once you've got the new pipe installed if you want more top-end drop a few teeth on the spur gear (cheaper than upping the teeth on the pinion). You will of course lose some acceleration in the process if you up the gearing.
Here's my MT-A4/MGT, if you've any more questions just ask away [)]
