Thanks for the comments guys, they've been REALLY useful, so Ive gone and taken on board what you have suggested and the results are below.
The image was PP'd on ACR then I used Efex Silver and one of the presets and whacked up the structure value. Silver Efex uses tone mapping so I guess thats where the weird stuff came from. Ive refrained from using SEfex on the re-work and just used simple tools from PP.
I didnt plan the position of the shot - as soon as I saw it, I thought thats great. Getting anywhere near that place is a nightmare but from this street, its perfect
The first image is the colour image, pretty much straight from the camera, I have bumped up the contrast via ACR on PP loadup, a little to get the colour version popping. Then I used one level of unsharpen mask and that was the colour version.
The B&W conversion is desaturate, then bumped down the brightness, put up the contrast.
No tone mapping this time, so there shouldnt be any halo or weird artifacts.
I did crop the B&W version as there was a rather large dust bunny at the very top of the sky. I might crop the colour if its good enough
Rob - I had heard of the glowing lights lol. Thats for the edit, it is better than my first attempt, hopefully this rework is much better and not OTT on the processing.