Seems like you need to do a bit of random reading. Party members can be turned back into maids (not disguised ones) with Yterre.
You shouldn't be locked out of Ripvannibala, unless there was a change to the City of Mist challenge line.
