The urban ranger archetypes picks locks just fine, pretty close to the rogue and better at combat to boot.
I've found these to be better selections than going rogue.
Tank or ranged rogue - ranger
Sneaky rogue - ninja
Utility rogue - alchemist
Support rogue - bard
Each of these is a better choice than rogue. In the OPs post, an urban ranger would probably fill both roles he's missing.
I have no issue with a ranger and they are a core class and can fulfil the role of a tank and some of the role of a rogue. The alchemist is more of a blaster (yes we have one) and the bard is more of a buffer. None of these will ever match the all around 8+ Int modifier in skill points of a rogue that can do so many things well to say nothing of the things he does better than anyone like finding traps and disable device. A ninja is sneaky but not using oriental characters or weapons. Been playing a thief/rogue since 1E for 32 years and I tell ya no one out rogues a rogue!