Thanks for clarifying the differences!
I ended up coming back to Canada without doing the FAA CFI (it doesn't transfer to TC, of course, so I didn't want to spend the $ twice) so the only visa I personally dealt with was my student one.
To airplaneholic, let us know if you figure anything out!