You are absolutely right for the happiness and health caps during the early and mid-game, though I think Drama and Mathematics come quite soon to push back the happiness cap.
Nevertheless, your estimation for the CE economy is much more realistic and therefore less optimistic than mine, and...