It's still not a clear choice, at least not in Portugal. A solar panel + battery setup pays itself back in 10-12 years, without selling electricity back to the grid. This exceeds the warranty/lifetime on batteries and exceeds the warranty on panels (although not the lifetime). It's a risky proposition.
Selling back to the grid is priced at the wholesale price: 4¢/kWh (slated for 5¢ early next year). It's sold at a loss, since consumer prices are about 10¢/kWh by night and 20¢/kWh by day. The ability to sell back does not move the needle on the payback period.
And note that Portugal is a sunny country. A panel works, on yearly average, 5h/day at full power. In central/northern Europe the numbers are probably worse.