Can the self-employed version handle a mixed year where we had both employer and separate employee contributions to our HSA?

Yes, the program will automatically pick up any contributions contributed through your employer from your W2 entry.  There will be a screen in the HSA section that asks if you made any separate additional contributions (make sure not to also include your contributions made through the employer in this section).