I ended up ordering something from AP I don't think was mentioned in this thread. As the saying goes buy once, cry once ...... Except I bought two so double the

Looks like the lead times are about 4-5 months still. So now the waiting game starts.