You are nearly there.
You have $30k in passive income from the properties and dividends from the shares of about $3,000 pa (guess).
So you only need another $17k pa in income to get to your goal.
to get this you could save up another $340,000 into your offset which could take you about...