[Wish]

Your math is right, sorta, but it doesn't include the fold-equity you get from shoving. The other thing that looks wrong to me (and there's a possibility I might be mistaken) is that your calling range for villain is way, way, way too tight. Basically, the way you did it, you assume the villain always has a hand this strong, and always calls (which, I suppose, is true if he always has a pair, ace, or strong king).