Hey Matt, thanks so much for the suggestion here!
These formulas are a bit above my skill level but I see what you were going for moving the current equation over to be based on actual spending. For some reason, I got an error on both of these cells using your recommendation.
Although, you pointing out that the table was pulling from D16 and E16 was enough for me to find a fix. I removed both of those equations and just put a basic division problem in column D for each category of spending (necessity, discretionary, and savings) over total expenses. This got me the numbers I was looking for without disrupting any other formulas from what I can tell.