Marriage contract is correct. You run into problems when you throw it in right before the wedding, she gets to claim she was coerced, etc. Got her a separate lawyer, signed 14 months before the wedding date. I'm as solid as you can be.
Yeah you did everything you could do but a good lawyer can get out of it. I've seen it happen all too often. Marriage contracts in Canada are shit. If you have anything about home ownership in it forget about it. That shit is not even remotely binding. The other stuff can be binding but even then, it can all be fought. She doesn't need to know that though.
Best you can do is keep your funds separate and hope she doesn't challenge too much if the time comes. The beauty about these contracts is that it makes things a hell of a lot easier during a divorce. A good marriage contract should be simple and straight forward. You take from pile A, she takes from pile B and you go on about your seperate ways.