I've rehabbed a few CCMs and I have a bit of a heads up for you. CCMs of that vintage use a crown race on thier forks which are slightly smaller than standard. In the pre-paint picture of the fork you post, it looks like the crown race is missing. Was it rattling around on the steer tube when you removed the fork by any chance?

Most CCM bikes I've seen have had trashed headsets and crash damaged forks (in fact, the dent visible in the second fork picture makes me a bit squeamish). Unfortunatly, headset parts in this size are not readily available these days, so unless you can find a stray CCM crown race somewhere, a new (old) fork is probably your best option. If you go the new fork route you'll want to look for one with near the same rake, and the same steer tube length.

If you're near an old LBS with packrat tendencies, root around in their used parts and see what you can find. Good luck!