You don't need to wait for visa number.
Provided your marriage is genuine, it should be much faster than EB I-485.
You have to fill in the A# from your EB I-485 receipt on all your new application forms. If you receive your AP/EAD, you may use them until expiration.