Yes. Stop shopping; start shooting.
The lenses you have are what most folks would already choose for landscapes, cityscapes, and street shooting.
If you don't know what lens you should "upgrade" to, then chances are good, you're not ready to upgrade. You need more experience with the gear you do have. And it's when a specific frustration starts to eat at you with a specific thing about a specific piece of gear, that it will become clear you may need to spend money on something to solve that frustration. But you have to know your baseline technique is good, and that you've already tried your current gear to its limits before you'll know you need something.
Want something is different. Everybody wants newer shinier gear for no very good reason other than that it's shiny and new. Some of us can afford to indulge this whim. Most of us cannot. So, it's probably smarter to wait until we know what it is we need.
From Aaron Johnson's What the Duck 174:
In addition to this, don't fixate on just the camera bodies and the lenses with your spending. Gear-wise, support gear, lighting gear, and post-processing software are possibly more effective ways to spend cash; and books, classes, workshops, videos, or airline tickets may actually be what you really need to improve your photos.
See also: Lens upgrade paths (sub $1000) for the EF-S 18-55mm IS kit lens for Canon APS-C cameras