Thanks for the speedy reply! I'll follow your advice and start looking for the XL RD3 in addition to a new rim and spokes then.
While I wait for parts and tools, I'll disassemble the rest of the bike and give it a good cleaning as well as fresh grease/oil.
When you refreshed the front hub some parts were worn, did you replace them or just clean and relub? Can spare brake pads be found new for these old hubs?