A nice thing is that @chapoi has some time earmarked soon for looking at the composer toolbar.
I agree with the feedback, even I get confused about the two different “create event” buttons.
I wonder if one option here is something like this?
We would probably need some new core primitives to support this and new extension points, but it is certainly way clearer.