It did feel like Danny changed his mind about wanting his emotions removed as soon as he realised that it would be helpful to the Doctor, which seems really petty!

I actually found it a bit difficult to feel sad about Danny and Clara's parting because of Danny's attitude to the Doctor just beforehand. The Doctor and Clara's sad farewell made me tear up a bit though and so did the Cyber Brigadier.