Good luck with your workshop David.
I know exactly where you are coming from as far as work moving away from my skills is concerned. I have had my ‘machine’ side of my workshop for nearly 4 years now and have thoroughly enjoyed getting back to designing, making and fitting all sorts of bits and pieces (see pics for some). Which, I must say, is why I got into engineering in the first place, making things.
You might want to consider a bench or pillar drill too, I have found mine invaluable. The trouble with working in the engineering industry is that you are spoilt at work, so you have greater expectations of your own kit and a bigger shopping list of tooling you would like at home. Hey, but it is fun and I get from under ‘her indoors’ feet.!