Thank you, JSWolf.
My library already is all in ePub, so I'm only considering the Kindle if there's some "essential" feature that I wasn't aware of when I played with the demo models - if Amazon is restrictive about the typesetting compared to Kobo, that's definitely going to push me towards Kobo.