I think for swamp, not only does the water spam need to stop but It'd be pretty cool to add a feature where parts of the tower actually slowed you down, just a thought.
As for deadwood I love the improvement in space, no more slim halls making it easy to defend and easy for team memebrs to block your path.