Kudos to the two Scholars above^^
Pure opinion without directly answering your question, you are on a path that I too followed. I suggest overcapacity now, and then just sit there. Lvl 24/23/23 seems to be the sweet spot for now.
There exists a "high point" for where the game wants to get you to in terms of resource capacity. This is a concern for anyone who weekly plays the the Lighthouse and wonders what their capacity should be, however, in my years of play, is well guided & fair strategy by the game.
Keep to your analysis Captain Marvin, you manage an efficient Haven