@LD1 Sorry to hear about the solar ROI problems. When I first looked at solar for our place, it didn't pencil out either, but then as solar costs dropped, it did pencil out, and the ROI ended up being five years or so.
Have you looked at adding batteries to your ROI mix? They make a big difference for us in terms of being self sufficient day to day. Can you also load shift a bit, moving your water heating to solar hours, etc.? I readily admit that our rationale for batteries had everything to do with outages, but the load shifting made a big difference in costs, but our power is more expensive ($0.50 peak, $0.19 off peak, at the moment), which speeds up the ROI.
All the best,
Peter