There's more to see in York than Stirling, but since you made the effort to go up to Edinburgh already, why not see Stirling? You can do York with any trip to the UK. It's just 2 hours from London!!!

And June 1 of your new schedule is impossible. You don't have to time to go Edinburgh - Stirling - York - London in a day.