Another huge problem with these calculations is the very small fraction of people who stay in one house for more than 10 years. Essentially you have to stay in the house for the entire payback period or you've lost out.
Personally I think the solar price will have to drop to the point where it is much lower than grid (with no subsidies), rather than just about equal. At that point, takeup will be much higher.