You are farther ahead on the SE question than I am. But it sounds like having your cake and eating it too -- if you want to be taxed as a resident all year, pay SE tax like a resident all year.
