Sounds like you have good plan but thought I would add my 2 cents re: IVFA.
We have just changed clinics to IVFA (Kogarah) and I am absolutely bowled over the level of care I have received since we changed. For example, haven't even started a cycle yet due to AF going AWOL but they have been closely monitoring with bt's, get back to me quickly with results and as my own FS is away at the moment I have already been contacted by the FS covering for him to discuss my situation and to give me his mobile if I have any concerns.
It has served to make me realise how unhappy and poorly serviced we really were by our prev clinic and FS, so, so far extremely happy with IVFA! Good luck to you!