Apple has released some rumblings that it's going to bring back a modular Mac Pro and keep it on x86 even if it goes to ARM for the Macbook, but I wouldn't hold my breath.