Looks like a great project. About a decade ago, I swapped out a 5speed manual for a 6 speed manual from a 330. What a difference on road trips. RPM's dropped by about 450 at 60mph to 2350. I now get 30+ MPG on the highway and a much less buzzy engine. Think about it for your next build or when you find the S54 engine to swap in.