how about adding a 2 or more car garage to either of these ends as shown. Match roof on one side and extend up on the other.
The addon on the right should just clear the existing lean-to so its left bay would become more storage than car-parking, but maybe make the new garage YUGE enough it spans wide enough so a garage door on its ass end would allow drive through parking into the lean-to's left bay.