As discussed in this other post, $AB$ and $BA$ always have the same characteristic polynomial, but not necessarily the same minimal polynomial.
This means that $AB$ diagonalisable does not imply $BA$ diagonalisable, as shown by the example $$A=\begin{pmatrix}0&1\\0&0\end{pmatrix},\qquad B=\begin{pmatrix}0&0\\0&1\end{pmatrix}.$$ On the other hand, we know that if both $A,B$ are invertible, then the statement is true.
As mentioned here, it is also the case that the non-zero spectrum of $AB$ and $BA$ is always the same.
I am looking for an answer to the slightly different question: assuming $A,B$ are both diagonalisable, is it true that $AB$ diagonalisable implies $BA$ diagonalisable? The counterexamples I've seen (the post linked above and this one) all involve at least one non-diagonalisable matrix, hence my question.
If the above is not true, what about the more restrictive case of $A,B$ both normal? Or maybe the case with $AB,BA\neq0$?