There are some (especially in S04), but I don't know that "Picking between the Town and Colony House" was precisely a specific plot point to be repeatedly revisited. The divisions between them ended by the end of Season 1 and it became more relaxed.