I don't recall ever having issues with her wandering around the save point forever. I always thought she sad down pretty shortly after you do. That's kinda weird. But I can see how that'd be annoying. I guess if it worked properly it'd be cute, but oh well

I honestly still prefer it to Shadow of the Colossus as well