Thank you for your insights, this has been useful! (I was actually hoping to ask this to a linguist for some time now, so I was happy when I saw your message!)

You surmised my current situation well, I've been focusing a lot on the 5 categories and little on the locutions. I shall remedy that :)

One thing in your answer that I'm a bit fuzzy on is what you meant by the confusing thing in the brackets (act/force and [or vs] intent)?