[magnetowasright]

Switching away from kindle is going to require some initial amount of faffing about, no matter what. I feel your pain.

Once you've done the initial annoyances of deDRMing your kindle stuff, you can use the kobo account and store. I know that's another account which you understandably don't want.

I've never used a kindle but my kobo is amazing. I do use the store but I do deDRM my books on a computer before putting them on my reader, which is not necessary lol