If I just take the 5 proper tracks, this is going to be a very strong contender for album of the year. Right now Without Walls is probably my favorite, and much like Spock's Beard's From the Darkness, the different sections of the song are different, but work well together.
The bonus tracks range from good to very damn good, but I don't know if I'd replace anything from the first disc with any of the bonus tracks.
Between Flaming Row, this, Epica, and Agollach, this might be one of the strongest two month period of releases in a long time.