Does anyone know if there is still a possibility of me receiving merit-based aid?
Accepted! No aid 
Ended up declining my Oxy waitlist for a spot at UC Davis. It didn’t feel right for me after a visit.
Congrats on making an informed choice that feels right for you. I went to UC Davis undergrad-you can’t go wrong there.