Non-Eu civil partner of Eu member

[sabm2]

hi,
I am Pakistani national and married to EU national in august 2018 and just received my EU family member residence permit on 8th January 2019 which says it will expire in January 2024.
I came in uk in november 2009 but applied for assylum in december 2015 and was issued IS96 in december 2015.
My question is whether me or my partner have to apply for new visa or pre-settled document? (my partner came in 15june 2016 in uk).
second question is there any chance that they can count my IS96 period? and when can I apply for indefinite leave?
my age is 30 and my partner's age is 20 years, my partner works part time and doing level 3 in college.