Trongsa-dzong, Tongsa-dzong-Trongsa