I think it's pretty clear there's only one "EVIL REDMOND BASED COMPANY" and you absolutely need to perform as much CYA as you possibly can. I mean it.

Document everything. Ask a lawyer about your current contract agreement and if anything is off, have them change it. You'd be suprised at how many companies will change their contracts if asked. But you have to ask and in an intelligent way.

However, the way you've operated so far is absolutely unethical to, not the company, but to yourself. DON'T DO THINGS YOU'D BE ASHAMED OF TELLING YOUR MOTHER YOU DID. My personal belief is that you should never do things that are dishonest or misleading, and that's probably why I'm not rich too.