Easy enough to make your own punches and dies using something like EN8. Heat to cherry red and quench in oil to harden. It's about time you built a CNC punching machine.