Terry I did end up talking to http://www.guardianpartners.com.au and they were helpful. Basically after going over the details of my situation the advice was just to buy the property in own name, rather than a trust and if using savings from the company to pay top-up tax on that.

Terry, thanks so much for your reply! Do you happen to know any good accountants I could talk to, or do you help with this sort of thing yourself?