Are you sure the fitpc2 couldn't satisfy your requirements? Their parent company has a distributor in Canada.

http://www.compulab.co.il/representatives/tracan.pdf

I've had to give the one I was testing back to its original owner, but all in all, I've been really impressed with it. It ran Ubuntu 11.10 desktop absolutely flawlessly without breaking a sweat. You could get a 1TB disc in it no problems. Given it also have built in wifi, you shouldn't need anything else plugging into it.