I wouldn't think 33%. That seems high. In terms of how much solar will improve in the next few years, I wouldn't say immensely. The technology is pretty much at its peak efficiency as I understand it. There are ways to enhance how much you can get (proximity, south facing ect.)
A 20 year lease, thats probably about the normal payback period right now so that number isn't out of left field.