I'm thinking of filing as a non-resident but is that ok if I file as self-employment?
Yes. If your Canadian income was from self-employment, then you would need to file it as self-employment income.