I think those are the most likely options. I don't want to rule out Benson getting the 9 game look if he is great in camp. Even with Savoie a year ahead, as I said yesterday, if one of the players explodes, they're going to get the playing time. If Quinn can come closer to the shorter end of that rehab timeframe, they can make do with one of these guys or the likes of Rousek/Biro in the short term.
As for Olofsson, I think that move does wind up being for D, even if it is indirect (add a pick and then later trade a different pick for D). This is the easiest time of the year to make that move and get the right return.