At the moment I have an adsl modem/router, the D-Link DSL-504G.  What i would like to do is buy another modem/router which can do exactly what the one I already has can do, but with wireless capabilities added, and I should probably also get ADSL 2/2+ as well, but I'm pretty sure that's built into most new modems nowadays.  So do you guys have any suggestions to what I should get?

BTW I dont necassarily have to stay with D-Link so if you think another brand is better, don't hesitate to suggest it.

Oh and if for some reason it makes any difference, I'm from Australia. Don't know why it would make a difference but you never know