RGM belt drive

RGM provides a Commando clutch basket with an adaptor to fit on an atlas mainshaft, I have read here that it was out of round so I opted to replace the mainshaft with a Commando shaft and all is working well. Now it is time to do it again and the question is...has the adaptor doo-dad improved or is the best idea to replace the mainshaft? Anybody with recent experience with this kit?