Just to correct your initial mistake, the 21.5 inch iMac only got the Broadwell chips because the ones with the better graphics cards (IRIS PRO 6200 in broadwells case) are not available for skylake chips yet. The 27 inch got skylake because the worse integrated graphics don't matter when you have dedicated graphics cards to take up the slack when needed.
To answer your question when Intel release all the appropriate chips, to give you some idea the Core M in the macbook due for release before christmas and the ones for the rMBP's are due for release early 2016.
Unfortunately for you I don't personally think the air will ever be updated again I think it will be kept as a legacy product for a couple of years and be replaced by the macbook, much like happened when the rMBP replaced the MBP.