I have mixed feelings about HF Shirou. On one hand, he does transfer the one he must protect at all costs from everyone to simply Sakura, but on the other, he finally chooses the path of the man, as opposed to one of the machine, and truly starts living for what he cares about. UBW is rather open-ended about him threading the needle between the two and trying to find the best parts of being an ally of justice, and Fate just simply gives him an ideal exemplar to ground his "programming" in.