Wouldn't hurt to run fiber to the 2nd closet, and be sure to take the time to set up QoS for the voice properly, but otherwise looks like a sound design.