he told you if you marry before the approval, you can get the green card much easier, this is true, but I don't think he can get I-485 approval at that time, but I-140 should ok.
If you really love him, please don't care to marry him later or ealier. but should be careful for your status.
Good luck!