I don't have an issue with your math, but your analysis may be missing the forest for the trees.
WDW was not designed as a place where people pound rides from open until close. You're probably a long time visitor like me and have noticed the difference in the total experience between then and now. People were able to spend time at the resorts, water parks, theme parks, shopping venues and restaurants without feeling like they were wasting time and money.
I don't want to get into a chicken or the egg argument but a combination of poor management on Disney's part and a much faster-paced society has led to a worsening of the experience at WDW. If people are paying for rides, then rides have more value than walking through the Maharajah Jungle Trek or taking a boat ride from DS to POFQ to watch the entertainment. Ride capacity now becomes a serious problem when it never used to be that way and restaurants and other non-ride experiences are valued less and visited less often.
In the short term, Disney would rather have the money from selling LLs than the profit from TS restaurants. But people are not having the same type of experience they had back when they could take the time to enjoy the parks.
In my opinion, WDW is circling the drain and I don't know what if anything is going to stop that process. My family still enjoys the parks because we are fortunate enough to be able to absorb the type of uncharges that make that possible without feeling bad about it. From what I'm hearing and reading, though, we are likely in a small minority.