Well, the shop said they took it for a 30 min ride and couldn't replicate the issue. But they upgraded the firmware. On the plus side, they didn't charge me.
Took the bike out yesterday, and it didn't do the 'lurching', so... perhaps it's fixed? Or perhaps it will just do it next time - it is...