Anyone recommend a solar battery installer for Oakland?

I put in solar panels a year ago and am now wishing I had gotten the battery but I just didn't have the funds... But now, given the general chaos in the world I think I should do it. I was told the Tesla Powerwall 3 was the way to go, but I keep reading that Tesla will render it obsolete soon. I have a limited budget and am trying to find the best battery and price for install. Also, do I go with a solar company or buy a battery myself and hire an electrician? Any recommendations or advice on batteries, installers or anything else is greatly appreciated.