since for the Lemons race, don't want to spend too much on it. perhaps simple b18 or b20. the swap you mentioned sounds perfect, but the b20 would give you more torque. I'm assuming a track with plenty of turns, so not likely to be in 5th very much. acceleration over top speed might be best in that case