nice work ! i find the switch on/off/on tip a good thing to minimize the panel side, i really want a small one.
it will look something like this
the schem with corrections
and i try a stripboard layout