The other e-reader to look at is Sony PRST1 as it has about same features as Kobo Touch and most of the wanted features KT doesn't have yet. No book shelfs but sorts books into collections by meta data that is part of epub books. You can edit this meta data for each book with Calibre to customise the categories. It is much faster adding books to it's data base than KT. As with any e-reader it has it's own problems and quirks fewer in my opinion so compare reviews and look at it's forum. Sony PRST
https://www.mobileread.com/forums/forumdisplay.php?f=100