There are a lot of bands in your list that I don't recognize by name (though I might likely recognize their music). Of the ones I do recognize, I agree that most of them belong there.
I'm not sure I'd classify The Carpenters as "Rock and Roll", though. I'd put them in with your first group. I liked their music (I had one or two of their albums on 8-track tape) - and it was definitely influential, but it doesn't really feel like rock to me.
Really big snub: Steve Miller was inducted as a solo artist in 2016. That's a travesty.