These series really need to be separated out.
Fate/Stay Night is having a remake, that will be a sequel to Fate/Zero, and therefore the old F/SN won't be directly linked.