I thought he was going back to the root in Fate/Extra which had potential. Semiramis also felt like that version's Sakura and she got with Shirou too. But a shame it was a true shit fest.
Should have had Mordred as the protagonist or Semiramis and ignore all the super homunculus shit.