@koalatax , thank you very much closing the loop and that you have had your question already answered.
Just wanted to be sure that you understood :
(a) that for the self-employed portion of your income , the amount transferred to form 2555 ( Foreign Earned Income Exclusion ) is the same as the amount shown as income for Schedule-SE ( Self-Employment Tax);
(b) that unless the country where you have your tax home has a Totalization agreement with US, your wages ( from employment ) are also subject to Social Security / Medicare taxes and is best done by reporting as if this was self-employment income ( Schedule-C ) except that there is no deductions allowed .
Hope this does help --- Is there more one can do for you