I suggest de-Kindle-ing yourself. Kobo or anything else with Koreader is great.
I had contacts with people in the Kindle unit (I used to work at Amazon), and apparently the focus is on making as much profit as possible. So the Kindle ecosystem is probably going to be on the downwards spiral pretty soon.