Nice build. I had the same issue. Now I have a 90 sec gen 4cyl. Wife and kids love it! Daughter is happy because she gets to go a lot more then she did in the past.
You might want to consider transmissions too. Mine has a G52 or 58 (don't remember at the moment) in it.
This is my rig
