Yes! This is something we have suggested to our dear product people and they immediately saw it made much more sense to expand the standard, dry and often misleading user story into something which is more of a job story.
I especially liked how you called a story on saying that a user “wants to click a button so that they can submit the form”. That is so artificial and incorrect, not to mention ridden of any context or personality. This way of writing stories narrows humans to warm body robots.