Dior make a matching shaving cream but it's truly awful quality, so much so I felt guilty when I sold it on.
Pinnacle Suave mentioned above is a clone of the modern Sauvage not Eau Sauvage, totally different scents. Apricus is supposed to be an Eau Sauvage scent but I've not tried it and heard mixed reviews on how accurate it is, was also a limited run so obtaining it might be tricky.
Marks & Spencer's "Harvard" aftershave was always touted as an Eau Sauvage clone, it's only a fiver so might be worth a try? For a soap, personally I'd just pick any good citrus as it will compliment it... Speick Active for example is lemon with a spicy herbal undertone.