I don't think the Lupins' deaths were replacement exactly, JK said she was trying to mirror Harry's whole godfather role...but it was extremely sad, it felt like there was no closure to their deaths. In the Bloomsbury interview she said that Lupin was killed by Doleav (sp) and Tonks was killed by Bellatrix