It is weird seeing Yamato as Tenzo trying to assassinate his future captain, but the tension in their fight was perfect.