You may want to try something like a ghia gearbox as they are more for cruising in, diesel is all low end

Maybe a 1600i box would also be ok ?

cheers

Rich