Same journey here; except using the Calibre Web integration, an absolutely gamechanger. No need to plug-in to sync my own books, they're pulled straight from my Pi. And I love how all that was required was editing a line in the config file on the storage; they seem like fairly open devices.

Also glad to get away from the Amazon proprietary formats.