No the fix is to mark the move-into-folder behaviour as a bug when --exchange was given.
Why? --exchange already tells mv to expect swapping 2 files (or directories). Read: taking that as "move into directory supplied by 2nd argument" violates users' expectation, violates the principle of least surprise. And THUS should be considered a bug.