I've made this adjustment in my .emacs

> (setq ediff-window-setup-function #'ediff-setup-windows-plain)

and run for a few days now without any hangs, so I'd say this looks like a good workaround.

Thanks.