best bet would probably be 6 speed, just because you probably wont have to rebuild it in the future, depending on how long you intend on keeping it. there are a lot of threads here that outline the 6 speed swap, and problems and pieces you'll need. plus you get the benefit of 6 speed, and more...