Yeah, that kinda sucks. Although, I once got beat by the Dial a Ride van while in my Chevy Impala. That was a bit embarrassing.
Seems like you're on the right path. Have you thought of a supercharger? I know that's big bucks but, that would cut to the chase.