Personally I like the intro being off-time. It gives a nice sense of tension-resolution rhythmically. The only thing that I would suggest, and this is true for most trance(or whatever the hell the genre is I get confused with electronic music), is like a grand finale. Usually somewhere at about 3/4 of that type of song, there is a big silence, the elongated double build up, and then a huge amount of layers going on. For the whole progression, that tends to usually be the case when it comes to the 'chorus-like' or "b" sections. They tend to have layers that were added on or layers that have been replaced. Regarding the grand finale thing, it's kind of like a comedy act, where they introduce motifs from throughout the act, again why some earlier layers should be replaced at an earlier point in the song. Wow, that was long-winded, sorry. I just love talking music.