Concurrency issues can be solved by restricting the UPDATE to the version passed in by the application.
If I think I'm updating version 2 of an entity, then only update that version, otherwise throw an error.
I've updated the post to address this scenario.