People will get better results with 6kwh than we do with 8kwh in different countries.
It all depends on location. And panel direction and angles.
If you can wait for the batteries then what about going for sodium ones? They are supposed to last longer than lithium.
If you've got the cash, the land, and the know-how I would go bananas with the panels. They are maintenance free, unlike turbines. They usually have 30 year guarantees, unlike turbines.
Just do some good research in to dump loads.
We are going to be adding another 18 or so panels when our barn roof is repaired. Plus a few more on our car port and then completely fill the main house roof next year at some point. There's no point in doing it until all the insulating is finished and we finally know how much energy we will need in the winter months.