The PVWatts-Battery model is too limiting, especially concerning dispatch options. Replace the existing model with PVWatts-detailed battery as this has straightforward scaling and avoids a lot of problems with inverter sizing in detailed PV.