Kobo are very good with Calibre; Calibre can put books in collections "automatically".
As far as Clara vs Libra, how about both.
Since you have an Oasis 2 and a PW4, they are relatively similar to the Kobos. I believe the Libra has waterproofing and the Clara doesn't.