There is no 90 day rule for USCIS. There is no reason to wait. Either file a proper I-485 asap or leave and wait out the consular processing. I would not, under ANY circumstances, let my status expire.
The issue you could have with AOS is if he made specific statements (that he would not adjust status) when he entered the country as a visitor.