No--the reason Jonah was angry was that God chose to spare Ninevah--a mortal enemy of Judah at the time.
It would be like one of us going to Iran and proclaiming God's wrath on them and they repenting and being spared, rather than the destruction we hope would befall them.
Jonah hated Ninevah, and he hated having to go there, and he REALLY hated that God spared them.
You’ve nailed it!
Yes, you make a very sound argument.