Brad, I am following the thread with high interest...and yes...I reckon'd that you'll have a 6-speed manual.
I wish to convert to manual as well and 5 speed would suit me. But it's hard to find a manual box (either 8G Galant 4WD or Outlander/Airtrek 4WD or Chariot Grandis 4WD in Germany).
But anyhow, great project and good luck!