I watched Coming Out week -- while I agree that he probably decided beforehand that it could be a card he might play at some point during the season, I don't think that the way it unfolded was in itself "staged". He really went through it. It's ironic that Lewis ended up being the sympathetic listening friend for it after Sian scared him off. I found it touching while I watched it.
Now he just needs to stop being a cold repressed Tory and he'll be HAWT.