I think you have all you bases covered. I fell into the same trap you are in 12-years ago. I have grown out of it, and regret buying all the rifles I did.

IF I could do it all over again? I would buy all top quality rifles & top quality scopes. I would own fewer rifles. The rifles I have bought in the past,have too much caliber "over-lap".

My advise, space your rifle calibers out to cover all the game you hunt, with the fewest rifles.
Example:
22lr.
223
25-06 or 270 (flip a coin)
338
416 or 458 If dangerous game is on your list?