Your edit is correct. I deleted the postcode as these are already mapped by their boundaries but I should have checked when it was added before leaving the comment.
This guide provides a lot of useful info 
https://wiki.openstreetmap.org/wiki/Australian_Tagging_Guidelines