So, 56% cost efficiency at the renewal. What is the 6% discount rate?
Agree with rest, except that I think you're not optimistic enough on efficiency improvements of new products (at time of renewal), but even if it is higher like I suspect, they're already closer to that than they used to be, so I think your point still holds about it plateauing by a little bit, just because it's hard to imagine the efficiency getting wildly better than 20% super fast (I suppose some breakthrough could get us to the 80% level in many decades).
Regarding the efficiency improvements of the future, let's look at the current NREL (research) chart (currently shows 2016-08-12):
I see that a few years ago, Panasonic was at 25.6% in the lab, and LG at 27.5% in the lab. The top score is 46%. My prediction is that over the next few decades, we'll start to see stuff between 25% and 40% (incrementally) show up in end user products, such as car and home roofs, solar farms, commercial roofs, etc., slowly and incrementally. That is only double. It's been doubling every 20 to 25 years or so. At half of double, something that is already working would seem like it could stay there until it's no longer useful, or if it's in the way of higher use. Also, if your roof makes almost enough and you get more cars but you can cover more roofs and/or car roofs with more solar, or install a solar car port, then you have efficiently increased your solar area without having to tear out working solar panels. Also, basically all of these systems are grid connected, so you don't really have to increase your generation; you can just pull more and more from the grid as the decades pass, to compensate. At the wearout point (25 - 45 years?), one can finally replace them, with the best newest and greatest that the homeowner (customer) can afford at that time (probably all roofs will be solar roofs, then, with some exceptions like flat roofs, pole mount, etc.). Also, in 15-20 years, there may be things like solar paint, for siding, or even just solar siding, that will augment the older stuff on the roof.
Some roofs will be removed and replaced. But not all of them. I think quite a few will go until the solar panels no longer work well. Mars could even have self-sustaining humans on it before some current Solar City roofs are no longer productive (although that's right on the precipice).