If that's the case
@San***
then you're totally fine.
You stopped being on amnesty the date they stamped that Non-ED visa into your passport and gave you a new 90 day stamp.
As long as you got that done BEFORE Oct 31st and leave before the current stamp in your passport runs out you're good and not on overstay at all.