I'd probably go with the Shaman as it offers more benefit to the Rogue than a Warlock does. The Shaman has Totems, heals and can still DPS when needed.

Also, I'd just get them to the same level first before you start questing them together, quests need to be non-trivial to both in order to get the RAF XP bonus.