I think you'll benefit from some good cylinder head mods. At the least, you should install the "lumps" in the intake ports and adding bigger valves and a performance valve job will go a long way at upping the power and overall performance without sacrifice to driveability.
