NYC flood defense plan advances, but completion years off