The final license, which includes some of the changes mentioned by James Carroll, is now live:
It was more work than I would have hoped but I think the end result is quite good. It should still allow anyone, like before, to self host Joplin Server, while also restricting commercial use. I don't expect it will be changed further unless there's something obviously very wrong with it.
In any case, thanks everyone for your support to get there!