Suggest also check again in 4-6 months time after the Nationality Law changes have settled (if they have). Right now the Government’s proposal is absolutely retroactive, unless you’ve got your 5 years and have already submitted your Nationality application.
…but the bill still needs to go by the President, and hopefully he punts it to the Tribunal Constitucional and they tear it apart for how “inconstitucional” it is.
Good timeline of the next ~5 weeks here: