I agree with you. I have no problem with Terry, but I was watching him and I for some reason he just reminded me of Dave. Probably was the screaming and posing after every move.
Kiyoshi needs to be used more often, the few matches he has are pretty entertaining, but they have become few and far between. Thankfully that may be coming to a close though.