Honestly, I'm just happy not to be in a state of constant doubt anymore -- I made my choice, and now I can move forward based on that. Which is why, though I empathize with the ordeal at large, I don't envy your exact situation -- you already made a decision, and then UCLA had to come in and alter the deal like a west coast Darth Vadar. Very nice, but also very cruel. Oh so very cruel.
And my choice was pretty easy, at the end of the day: go to the place I really, REALLY wanted to attend that I would have to shell out $100k for, or go to the place I also really wanted to attend, for the price tag of absolutely free. The fact that you got some funding for both complicates things. If USC had offered me even a portion of my tuition, I'm not entirely sure I would have made the same decision I ended up making. But that's a moot point for me.
Anyways, how long do you have to decide? When's the deadline for UCLA?
I think UCLA is very loose with deadlines since they're still admitting/waitlisting people. They don't even require a deposit. My guess is a lot of that has to do with aid distribution. But for the whole "state of constant doubt" part, I'd like to be able to come to a decision ASAP. NYU just said there's a chance for an increase in scholarships in your third year, which makes sense since that funding will probably go toward thesis films, but they have already allocated all their funds :/