There is no need to wait. In fact, waiting until you are out of status would be a big mistake. However, consider the following:
Your I-130 is probably on the verge of being approved. Then, it will, likely, be only a few months until your interview (depending on home country). You would then enter the US as a Green card holder.
If you change to Adjustment of Status now, you cannot leave the US or work for 3-6 months. In addition, you won't become a Green Card holder for at least a year after that.