Thanks electrik, I think I may try this first. The max teeth for this RD is 26 and I'm pretty sure my biggest cog is smaller than that.
Disassembling the RD for cleaning seems a bit tedious and if shortening the chain doesn't work, that would definitely have to be a rainy saturday afternoon activity...