You forgot the significant airframe work being done to both RAAF F-111s and RAAF Hornets. Should be able to squeeze an extra 3000 hours out of the F-111s and another 5000 out of the Hornets.
The new designation for the RAAF F/A-18A/B Hornets is F/A-18A+/B+. (just thought u might wanna know). Also, the F-111 work included integration of the AGM-142 Raptor stand off missile, the F-111's only stand off weapon, apart from the Harpoon.