Well, thanks to all of your quick replies I was able to get the express Passport, submit the information to the WHV office and update my information.
No more worries and stress about the matter, I now have a valid Passport for the next 5 years and a WHV with info to match!
Now as long as I don't get any hassle about not having a return ticket...
=)
