not sure what your recalculated UCGPA is, if it is above 4.25, you are probably competitive - of course you will find out soon.
OOS tuition is no joke and there will be no need based aid for OOS students. If you are competitive for one of the top UCs, there are likely to be a number of private schools that will offer a merit based aid package that will make them a better choice.
good luck