Lemon,
Looks like you've got it figured out - simple additions to get you close to your targets.
I might simplify a bit more by dropping the Epsom salts all together, doubling the gypsum, and rounding the calcium chloride to 0.5 grams per gallon. This will make your additions very simple - equal parts by weight of gypsum and calcium chloride - and will get you in the ballpark of your target. The calcium will be a little higher than target, but not bad.
But, yes. What you have looks pretty good.
Good luck with your beer!