Are 380-500 distributor assemblies the same for the Euro M116/117's?

I ask because my euro 500 has an internal centrifugal spring that is out of calibration, so timing advance goes too far under revs (with vacuum disconnected). Hence, would any 380-500 distributor work with the same spring calibration, or were the Euros tuned for different timing advance? Mine shows 16 +-3 at idle, 25 +-3 at 2500rpm. Right now I'm seeing 35-40 even before 2500rpm!