Since you're replacing gear and mentioned the Optimus stove, I went and checked mine. Sorry, it's the new style so no help there. However, you may be interested in the new Polaris Optifuel stove. Looks pretty cool since it can burn a lot of different fuel types. The pot supports don;t look like they'll match your cutouts either, though.