Great effort! I feel for you regarding the non-album stuff as you went to the exact sources - but didn't get the right songs. Dammit! So I'm going to give you those and reveal it was Pigeons and Vancouver. Also partly to shorten the tedium for everyone else not as (bafflingly but pleasingly) committed as you.
Further clues (don't go all Mrs Doyle on me now) - side 1 of Trick, disc 2 of Lamb, stay on side 1 of Abacab.
This is the most fun I've had in months. That's lockdown for you.
I'll be back to fill the gaps...