Suitable design philosophy for hex map in C#/WPF

See more:

C#

Visual-Studio

WPF

I've created a hex map that consists of child elements drawn to a canvas. Each hex map is a location within the game I'm coding. My design philosophy is to instantiate a collection of GameHex class from the game database and use that collection to draw the map at runtime. I have achieved that by creating polygons and adding them to the canvas. So far, so good. However, I want to add extra information to each hex such as hex number and icons for bases. I know I can draw additional elements and add them to the canvas in the correct location and link them in the code but the redraw action for each hex would involve finding each UI element deleting it and redrawing it individually. Is there a better design philosophy that I can adopt to link the UI Elements into a single entity on the canvas that I can then manipulate in code?

What I have tried:

I appreciate that I will need to individually redraw the elements but, for example, should I use a separate canvas instantiated at run time to draw the hex components onto and then add to the main canvas at runtime or will this cause other issues such as detecting which hex has a mouse click action? Any steers would be gratefully appreciated.