That's how you do it, the 2nd time you get the chance to fight magus you defeat him, when he gives you the option to fight him or let him join you. I think you have to go kill lavos right after it to see the ending though. I've never actually done it myself.