Urr, it really is both Not so much rasp now really at all tbh, that seems to have gone. Not sure about the metallic rattle, but I assure you, it's not rasp. It's something rattling against the cats when warm.
Either way, it's the least of my concerns atm.