I think Tony's man-crush didn't so much recede as enter the "I must impress the object of my affection by continually telling him how awesome I am" stage.

Sometimes, Tony is twelve.

The whole episode was so awesome. I think it might be my favorite so far. From the Steve/Tony interactions, to Hank saving the day with cockroaches, to Tony hacking Kang's tech, every scene made me squee.