Yup, I'm skeptical of the OP's tax advice. With the right direction this should have been a very easy transition, especially with what looks like a SaaS business.