If we're going to keep it to '70s and '80s American rock, I'd still take Petty or the Boss. Also Gregg Allman. Or Henley, Fry, and the rest of the Eagles. Or the Doobie Brothers.
I mean, I'm not saying Shaw is crap, but put down the pipe.
The Boss and Petty for sure. I'd add Roger Waters, Jeff Lynne and Mark Knopfler. On the less rock side of things (and I may get flamed for this) Elton John/Taupin and Billy Joel.