If you do not mind converting to ePub, I would recommend a Kobo Aura H2O or a Kobo Glo HD. Kobo Readers work very well with Calibre and Calibre can easily manage collections on Kobo Readers.
But as suggested, maybe you can jailbreak your Kindle and be able to use the Collections Manager plugin to manage collections on your Kindle.
|