Regarding buying a place to rent out, don't forget to factor in taxes and maintenance costs. Tenants don't look after places, so you'll end up having to repaint and get the place professionally cleaned each time they move out.

Does your mortgage allow you to make overpayments? If so, make small overpayments regularly, with the aim of paying off the mortgage when the collar ends.