Thank you. I ended up going for the foam, then, as you say, some filler. Will be lining the lot with wallrock as some of the walls have seen better days.
Oh, and you're right about the foam... It's a bugger! Wish I'd masked off the frames/windows. Mostly came off but a nice blob dropped onto...