For employment I would submit as separate - as this is not a typical employment and with separate contracts. You may also list the periods you were unemployed just to be honest. At the end it doesn't really matter as you are married to a USC
I know the estimated time on USCIS account doesn't mean anything. But I did see my estimated time updated -Estimated time* until case decision:
approx. 2 months