According to the Catholic Church, do guardian angels graduate?

I received two conflicting reports from two women whose catholicity I highly respect, but whose sources are circumspect, or at the very least circumlocutory. - One says that if and when we get to heaven, our guardian angel gets promoted up the ranks. - The other says that if and when we get to heaven, our guardian angel stays with us, and remains our guardian angel in heaven. I'm not an expert, nor do I know if these things can be known. However, I do know a contradiction when I see one. Which is right? Do our angels graduate, or do they remain with us in Eternity? Catholic answers only, please - no Sylvia Browne.