Banjo Wheel for '35

[Scott754]

I have a '35 Fordor that had a Banjo wheel installed when I purchased it (picture attached). From the prior posts describing various banjo wheels, this seems to be a '36 wheel. The paint is chipping, and appears to be brown under the black paint. I was going to repaint the wheel, but also the spokes are loose, so the wheel 'rocks'. I don't know if there's an easy fix for the loose spokes, so I was considering buying a new wheel. Will any of the new/reproduction wheels that are for '36-39 work as a replacement for this current wheel, accommodating the light switch I have on the wheel? Would there be difficult modification needed to make a new wheel fit? Thanks