Just to update, I went for the replacement cassette rather than changing brands. The bike is back to seemless shifting, so this time round I will measure the chain wear after every ride. I've also changed the way I'm using the battery modes (eco for most of the ride, only upping the power on...