Yeah I agree, that's what probably happened. And the nods (karate chops, powers, dragon tattoos) would've been quite clever on their own if they never confirmed Killian as The Mandarin. That would've worked nicely as a simple homage