Do you have 2x ball bearings (with some distance between) behind the jaw coupling? The dual setup with distance is important to prevent leaks in the shaft seal, due to wobbeling in the shaft.
A notch on the shaft between the two bearings can take thrust into the deep groove bearing (they can take quite a bit with regular service life).
See attached cross section on how we solved it with a jaw coupling. 
Nikolai
