Rooftop solar has both economic efficiency disadvantages (generally poorer siting, being dangerous and expensive to install) and advantages (no transmission losses, no added load on transmission and distribution systems, and in some cases elimination of inverters and other power electronics). It isn't clear to me whether it comes out to be overall more or less economically efficient, and I suspect that it probably depends on local circumstances, and especially on whether you can reduce or eliminate inverters.
However, the most persuasive case for rooftop solar is basically political rather than economic: it reduces or eliminates the building's dependency on utility-scale generation, transmission, and distribution. This dependency can bite in the form of unreliability (like California's intentional power outages during the now-yearly summer brushfire season, or the "load shedding" rolling blackouts South Africa had for several months last year), in the form of extortionate energy prices due to monopoly rent extraction (California being the poster child here at the moment, extorting 29.75¢/kWh from resident), or in the form of systemic fragility (currently there are blackouts in Kyiv because Russia is blowing up the power stations, which amplifies the coercive effect of Russian attacks on Ukraine).
I want to say, I greatly appreciate your help in getting these figures right.