The only question is can I do this being already in the us out of status or should I leave and apply in my home country?
Even if you wait until he becomes a US citizen, you will not be an immediate relative. Thus ineligible for AOS and subject to a ban for CP.