It's 2 total terms. There's no "resetting the clock" in that rule. Any attempt to remain in power for a third term would be blatantly unconstitutional.
That said, there's a real concern that he's likely to try anyway, and a non-zero chance that he'd succeed if he manages to fill enough of the government and military with people more loyal to him than to the constitution.
That plan tracks with all the advice I've heard about introducing cats. For letting them see but not touch each other, you could use a baby gate as long as it's tall enough that they can't jump over.
It sounds like you have a good plan worked out, good luck!