I wish I could tell you what to do to avoid Olive ambushing Willa. I suppose the only thing I can suggest is to give her a lot of attention. I assume you give Willa a lot of love and Olive may be jealous? A difficult situation.