While your math seems to be accurate, your premises may be lacking.
I am quite aware that many upcoming states will allocate delegates by congressional districts (WTA-CD). And 4 are Winner take all. The WTA-CD states could conceivably have candidates splitting delegates by winning separate districts.