More of the Disney Merlin than Gandalf to my eye, but a lovely custom!
Gandalf had no "Wizard's Workshop", he was a roaming wizard who only stayed in other people's houses when he could, so he'd never be found surrounded by bottles and books.
I prefer to think of Merlin more as a druid than a wizard, working his magic through nature more than bottles and books, but as you say, your inspiration is Disney's Merlin and for that he is near perfect (take the brim off his hat and he'd be even closer).
