x posted - USCIS renewal and change of country

I am coming here for advice from those in the know :) We are doing both the free one time change of country and the one time free renewal of our I-171h. To do the change of country I just need our homestudy update which we should get next week. To do the extension we need to wait until early November (to be 90 days out from our expiration date of our present I-171h). We are getting refingerprinted today. How should I do this? Should I:1. Wait till November and file the change of country and for the extension at the same time, or2. File change of country as soon as I get the homestudy update and then wait for November (or later even) to do the extension? We are dealing with Cleveland USCIS if that makes a difference in your response. Thank you for your input!!!