About the Kindle dilemma,
Amazon is hard to neglect and actually became what the name says. It is hard not to find a certain book on Amazon. I dont know how their system works but they really have everything you want and even everything you dont want.

Yesterday I searched for an author that Barnes & Noble didnt hear of....and on Amazon it was the entire collection of his books, paperback, hardcover and digital.
I even found "genuine leather case cover sleeve for iRiver Story" on Amazon.
I think the solution is 2 ereaders. An "universal" one with all formats and ....a Kindle strictly for Amazon downloads.