Your assumption is correct; Samuel should drop the rift wand, as well as a charm. I've updated the inventory file topic (and played through to the end of the game, to make sure nothing else was dropped which might be a problem).
Sometimes the wand can drop so it is obscured by the southern wall, and hard to see if a character is not standing nearby, but I assume you already checked for that situation.
After you meet Elder Anlokar and explore his (currently locked) rooms, you can find a hidden teleporter to another room, containing the wooden key and a golden chest (and other loot that may be of more interest). If you run around to the open the wood, stone, silver and gold chests, you can get the level 6 BF key. If the key isn't there and you want to finish off the BF, let me know and I'll get the inventory files for it. The final opponent is a fixed level above you, though, so leveling up isn't necessarily going to help you.
BTW, before you head back to Rivellon, you might want to have your DK unlearn all his skills and have him invest in summing doll upgrades (it is just the hero and summoning dolls in the after-game BF). I put about half his points into level upgrades and half into skill point transfers, and then upgraded the act 1 skeleton doll, as it was the only one that could use a ranged weapon (crossbow).
