Re-curve a HiRev7500 distributor?

So I swapped out the original 11-turn .035 spring for the .022, and gave it a whirl. Still 18°, but idling in park at 800 now. When warm she drops to 650 in gear... I'll visit that soon. The carb, at the moment, is a box-stock 1406.
I'm using a dial-back gun with a tach display.
Anyway, the new curve is:
Starts advance @1300, maybe a touch later
22 @ 1600
26 @ 2000
30 @ 2300
34 @ 2550
36 @ 2750
And she kept going. At least to 38°, that's when I stopped. I wasn't watching the tach closely, but it was around 3k. So the FBO plate needs to be swapped from 16° to at most 14°. I believe I've had this issue before, more advance than what the plate says.
I'll read those 2 threads (I may have already, in the past) tonight. That's another problem with being a West-Coaster, everyone's asleep when I normally get time to post stuff.