Finally got round to making the new scratch plate, I know there is bit of a gap between the scratch plate and the control panel but that will be rectified when I get my new metal control plate.
I am about to pick up some rotary switches for my current builds. Going with either lever or chicken head knobs. They are kind of vintage correct for what I am doing. May or may not look good on your build.