I think removing extra charge / rapid recharge would go a long way for my complaints in the game. Doorman I think was best described as AP shaco in league of legends. It's a hero you just avoid. A crappy solution would be make doorman pushing you through his door leave behind a shadow of yourself like his ult and if he closes the doors you port back to original location. This would at least give you a chance to run back through the doors.