I ended up just using the circle cutter for the remaining rings and discs.   There was still some irregularities, but they were usable.

Steve - some parts were easy - the parts with the straight lines.   The circles definitely gave me some grief, though.