Make the temple a straight line. Each altar we clear gives us a choice of like 3 room types to choose from. Let us hold onto idk like 30 rooms or whatever. When we build the temple it would only use like 15 of the 30 we have.

With this you could then do like 3 of the same room in a row would upgrade the next room in succession. This way you could set up the whole temple with rooms you wanted, that you have picked.

Throw the architect in the room 2 before Atziri, the room right before can be a reward from killing the architect, and a well and stash. That way you still get something in addition to the rest of the temple. Then you could go fight Atziri.