I don't actually agree that the Steve and Tony scenes were trying to build up the similarities between Tony and Loki. That's not how that read to me, although I know that is how it was for a lot of fans which is fine.

But no it's not near as random, I do agree.