Turns out they are cheap when you can get them small enough. only 60 cent each from oshpark, they are going to save time and even smaller than before at 0.39x0.95 inch (9.86x24.13 mm) 2 layer board.

No more switch, but pins 3, 4, gnd, vcc are broken out with fat pads and I had some fun with the routing. ^_-

will post links/files when I get them built and tested.