Mass and spin co-evolution during the alignment of a black hole in a warped accretion disc