Should we put our address now or the one assigned to us to move to in 10 days (I-130)

[Saif Sobih 0]

Hi everyone,
We are filing for i-130 and we don't know what is the right approach for filing in regards to our situation.

 

Situation:
the beneficiary (me) will have the medical exam on the 15th of December, and I want to file  i-485 after I receive my medical envelope to avoid delays from RFE. We will also move to our own assigned apartment (we already have it assigned) on the 15th.

Right now we are living in a shared house, and we have a floor for ourselves in that house but the lease is written as a (full house lease with all resident) it doesn't necessarily show who occupies which floor.
 

Suggestions for i-130 filing:
1. Should we wait till the 15th till we have our new contract which shows that only us are occupying the place for (Bonafede document), and to avoid changing the address between now and the 15th incase we file now?
2. Should we just file now and specify in the rental contract that we rent a separate floor for ourselves, and put the current address then change it in 15 days (How do we even do that?)?
3.Should we file now and specify that we rent a separate floor for ourselves, and put our future address for mailing to avoid changing it in 15 days?

What are your thoughts?