If you do fancy one other album with a similar mish-mash of really good songs, and slightly odd stuff, then Holland is definitely worth a look.
Was the last album of their post-Smile/pre-Oldies phase, and has (A) some really good songs on, and (B) a separate EP of Brian telling a weird story about a magic radio.
Not quite on Surf’s Up’s level, but still pretty great.