The way the sign code reads, it looks like they measure the farthest points using only a rectangle, circle or triangle. I scaled out the drawing using the door. Seems like if you want to keep your logo and info, the original design makes sense. Personally, I don't think the sign needs to be everything to everybody, it just needs to identify, but your circle design is strong and recognizable. I'm assuming you are leasing the entire building. If thats the case, use the circle logo over the main entrance door, or use only the logotype as large as you can and use the windows for your other information.
Below is how the area scaled out...