Agreed. While they don't need to nuke and rebuild from the foundation up, what they do need to do is move away from the Thornton/Marleau and go more with the Hertl/Couture/Burns thing. The thing is, because Thornton and Marleau are so ingrained into their team make up, it almost feels like a rebuild to kick them out.
ETA: Also, do they feel secure with Niemi? I think despite his cup ring, Niemi has proven to be both a strength and weakness for them. Usually strong but also susceptible to going full retard.