Yes, people can claim they are calling out hypocrisy to justify actually whattaboutism, but that doesn't automatically mean any claim of hypocrisy = whataboutism.

The key line from your own quote is.

which can take on the character of discrediting the criticism, which may or may not be justified