Good choices. I was thinking of Bad Brains, who started out as a fusion band, and Craig Finn's early stuff, but that probably gets into more post-punk.
If we're going out in the world of genre-spanning punk, Husker Dü, Hot Snakes/Drive Like Jehu, Wire, and (possibly if you count them) Shellac deserve a strong recommendation. The creativity and diversity in the world of post-punk is remarkable.