@jgsmith, I just went through the same process you did, and came to the same conclusion. For Canadians, I just don't think the Kindle is the reader to get. Especially seeing that we get charged an extra $2 for every book supposedly because of higher wireless costs. But we get charged that, even if we download on our computer and transfer via USB. I think that's criminal. It also means books that are free to US residents, are $2.00 to us.
I've found among the Sony store, Kobo (bills in CAD for Canadians!), Books on Board, and many other places, you will find the book you are looking for at the same or lower price than Amazon. If it's too expensive in one place, just keep checking. Likewise, I just checked out my first e-book from the Toronto Public library. ...you can't beat free!!
I bought both the 600 and 505 so I could do a real-life comparison, and I thought the 505 was head and shoulders above so I'm returning the 600. I would recommend you do some comparison for yourself though, as many people do love their 600 and it is very, very cool.