IIRC, His staff appearance changed anyway post-Balrog fight when he became Gandalf the White. That would explain the difference between fellowship and RoTK. However, this does not explain how he re-aquired the white staff post shattering by the Witch King.
It's just something I thought about...