I like it mate.......i reckon it will sound better without the atmosphere like u mentioned, or u could strip it out and just bring it in in the drop, then get rid again when it kicks back in? adding additional percs working around the excisting ones u have(which u also mentioned) can provide the variation both before the drop and after, just play about with programming of them throughout?
good stuff, post it up again when u done more ;)