james,

Caltracs would be my route, you could get away with an adjustable pinion snubber and slicks with what you have now which will improve your short times.