Hey FLD,
I am planning on getting a 2205S in the next year and planning on upgrades which include what you have done already and like your idea of how to add two additional panels on the roof.
Without having a real life 2205S in my driveway, trying to plan on how some of the work can be done...