Text this: Spin-Hall effect in topological materials: evaluating the proper spin current in systems with arbitrary degeneracies