I considered the Dancer trait as well. It'll make regular encounters go faster for sure, but it's rather vulnerable to maze. If Familiar and Ranger are placed in front there's no backup at all.
Therefore, I prefer the initial setup as it's 'maze-proof'.