Deep joy!
I'll buy it if it has a thick little booklet. I kind of prefer Oh Well in the two parts as well.
I like Dead Shrimp Blues in the low-fi version I have, it sounds like some old Paramount/Black Patti 78 with bits of delta mud in the grooves!
Oh, you know an obvious thought for a Disc 2 would be the solo The End Of The Game and 1971-72 singles, and Jeremy's 1970 solo (or would that be best with Kiln House?)