I heard the situation is not too different even this year.

Best suggestion copied form above:
"You never know, USCIS is changing rules frequently. I would rather gamble money to save several months. "

File I-485 today, it's easy, just read the instructions and you don't even need a lawyer.