As for the Dojo, it'll be fine; you've got to the end of Act VIII to build it (and get the full Jalsa story); after that I'll forcibly introduce her, since I need her for continuity even for people who refuse to build the dojo The tea-house will have more content as well; one side-quest I'm building now for Act VII+ requires the tea-house to trigger.