I sprayed wd-40 around the bottom bracket, not really expecting it to do anything. The push shove test still yielded creaking noises, but the creaks were not there when we rode this afternoon.

I think I'll have a cartridge installed at first opportunity.

Thanks.