Hi, I've been reading around for awhile, and I'm pretty sure I've narrowed down my choices to Kindle Touch or Sony PRST1. I currently have a KoboTouch and will be keeping it for awhile. I will wait to make my new e-reader purchase when there's a 'great deal'.

But I want to be prepared!
So, here's what I like about the KoboTouch, and my 'wants' in my new ereader. Incidentally, I initally went with the Kobo because I live in Canada, should that make a difference in my future decision? [Kindle a problem because it's US based?]
I use Calibre for my current library maintenance and have all epubs. How difficult would it be to switch everything over to a new ereader, either Kindle or Sony? Would one be easier over the other?
Likes; touch screen to turn page etc, dictionary, clock, book covers, book series in order [had to use Calibre plugin to get that on KoboTouch as well drm removal to read on other devices ie iPod, Blackberry], basic sans serif font and able to change font size
Don't need: browser or wi-fi, I use Calibre for library management, don't really want to be forced to use the ereader software which to me is an unnecessarily forced step?! I'm quite comfortable making my library purchases/changes through my computer via USB.
Purchases, would like the freedom to purchase or download where I please and add them to my library through Calibre.
I thank you for your time and advice.