Chrysler have been using that style of headlight switch since the Valiant days, the headlight switch in my Jeep looks almost exactly the same as the one in my VG! The only difference is a slight difference in pin layout.
Just a bit of trivia there
To get the shaft back in when you're reassembling, a firm push should do the trick.