Is $41,000 to add solar panels and battery storage a fair price?

I bought a new home build in Southern California (Inland Empire) in November 2024. It came with 10x Qcells-405W-BLK-ML-G10 Solar Panels and Ephase AC_Module_Type_H Microinverters, which cost me $16,099 and I claimed the 30% tax return on it. My existing system generates 3 kW per hour at peak. I'm currently on SoCal Edison with NEM 3, and they only give me $0.03/kWh for what I feed back to the grid. I drive an EV (2019 Tesla Model 3 Perf) 300-600 miles a week. I can charge during the day on weekdays, but usually only overnight on weekends. When I charge during the day, I have to dial my EVSE down to 10A max to avoid going over what my solar can generate. On average, I use ~450 kWh per month on my EV (5,313 kWh the past year, 512 kWh the past month). I typically use A/C in the summer/fall months from 9PM until 12AM/1AM. I don't have any more space on the south side of my roof; 6 additional panels max could fit on the west side, and any additional would be on the east side. I wasn't planning on this expansion soon, but with the BBB passage / 30% Federal Tax Credit going away, I feel like I should take advantage. I'm thinking the quote might be overkill because once the 2x PowerWalls are full, I'd be wasting a lot of excess generated solar by sending it back to the grid for pennies. My main goal is to achieve close to net-zero with my electric bill, but I'm struggling to find my sweet spot. I'm considering if 6x Panels instead and only 1x Tesla PowerWall 3 for now, or 4x Panels + 2x Tesla PowerWall 3s, would be better. Given my current tax situation, the max I can spend to get the full benefit of the 30% ITC is ~$39.5k, so I'd like to stay either the same or below if possible.