Which is a better way to use solar energy, mass-production or individual home usage?

I know we need to put a ton of effort towards research in renewable energy, specifically solar. But when it actually becomes a viable alternative to oil, and we can ~store~ solar energy efficiently, would it be best put to use atop individual homes and buildings, or as a source of electricity for whole cities?