Could there be 2 grid terminals in Tir. 1 Exit Point and 2 possible places for entry.

There should be a grid terminal in the old place, but have it so that you exit to somewhere else, like where it is now. (sortof like how Omni-Ent grid works).

That way when you grid to Tir theres less chance of going into a crash/link-dead loop.