I don't really understand why you do not use the equity in your home for everything that you need in the investment property.

You seem to be going to an awful lot of trouble to make your investment property as negative as possible in order to get a tax break, and then worrying about the after affects of paying yourself back the $25,000 deposit.

I would be getting a line of credit for the investment property using the equity in your own home and making the investment property as positive as possible. Capitalise your expenses for the investment property and use any spare cash to pay off your personal mortgage.