I'm on Calyx and in the same place. Just can't be arsed with swapping everything over so good excuse to get a new phone.