So I ordered the game through Origin. But I downloaded the game client straight from this site.
Was that a mistake? Will my "activation code" (or whatever it's called) not work with that version of the game?
You're fine. Basically, you just need to input the actual product code Origin sends you on the SWTOR website to convert to an active account once public launch hits. They will apparently start sending them out on the 16th.