Waver will be here for Saber after everything. Whenever the hearthstone is installed in the new Barrel, he'll make it clear that she's welcome and doesn't have to say anything to anyone while visiting. Just get into a different space for her thoughts.