My residence permit is about to expire at April 2021 and my situation is a bit complicated, or at least it was in the past, maybe someone can offer some words of wisdom

I was married to a Finnish citizen for 2 yeas befor we seperated due to violent behavior (of him against me), this marriage was what my current residence permit is based on.
I am divorced for more then a year and in a relationship with another man (also a Finnish citizen), we are living together for almost 2 years (will be 2 years at the end of December). We where planning to get married but had to cancel for now because of corona situation. My spouse suggested to have just a ceremony without a wedding so we will be legally married and things may go easier like that, but I'm worried that migri will think it's a bit too convenient that I happen to get married a few months before my residence permit expires, and once again with only an official ceremony and no wedding.
Question 1- Do you think I'm being paranoid for nothing, or does it realy look bad? Should we do the ceremony just in case or will it just make things worse this close to the expiration time of my rp? If I was lying it would be easy to come up with a good lie, what I'm going for is to make the truth look a bit better...
Also, will it be a problem that I was still technically married to my ex when my current spouse moved to live together?
I also just graduated from a vocational school here in Finland and now working at the profession I studied, but my work contract is temporery at the moment (for 1 year) and I'm still at trial periode (koeaika).
Question 2- which residence permit should I apply for and when should I do it? My current permit is A and was valid for 4 years, I already did YKI test 3 years ago (level B, got the grade 3 on all categories) I live with a Finnish spouse and now I have a job. Is it enough for a permenant rp? And from paranoid to extra optimistic, any chance I can already ask for a Finnish citizenship?
Sorry for the long text, I will probably have even more questions later...
Thank you
