My unscientific opinion: UCLA has a very slight advantage in a significant number of different areas (job prospects, location, teacher quality, prestige, to name a few). Taken together--and especially when cost of attendance is considered--I would choose UCLA without hesitation.
OP: I read the entire post with your numbers as total cost of attendance. Is this correct? If so, I applaud this move and I encourage everyone else to switch over to a (COA) vs. (Scholarship) standard.
If the numbers are scholarship offered then I agree that this is an easy decision. GW.