As far as I'm concerned for the Shrine, the writers wrote a beautiful friendship episode between those two guys (talking canon, not what I would like it to be) and then they realised (or remembered) that it might look "too gay" and that's why they added the last minute or so. The only problem with that is that it came out of nowhere.