I think you did well. Unfortunately there's no way to know when a kit will be discontinued, so, it is a good idea to buy them when you can.

My brother has spares for three of his favorite kits. SIG Astro Hog and Hog Bipe, and GP Super Sportster 60.