Every time they recycled shots for the films it's cheap and disappointing. The reused spacedock shots in TWOK are no exception.
I THINK that they might have played with the idea of having Kirk command the Enterprise in the battle against the old Bird-of-Prey, because he knows the weaknesses and has much more battle experience.
I never saw TMP so those scenes in TWOK never bothered me.
At this point I was REALLY tried of seeing the Klingons deplicted as the bad guys in the movies. Gene Roddenberry went to the trouble of making the Klingon Empire an ally of the Federation in the TNG era just to get away from that, since he never thought the movies should have been so much about Klingons vs humans. I really agreed with him on that.