I did the exact same thing except the disa rebuild (did ages ago).
Readjusted radiator mounting and fan as well.
Car heats up in no time now. Before it would take ten minutes or so. I suspect a blockage near the thermostat hardline area contributed to this.
Sent from my SM-N960F using Tapatalk