I strongly recommend not using Diagram.skipsUndoManager. Try things without and make sure that undo and redo work correctly.
Missing some ChangedEvents in the UndoManager’s Transaction may cause unusual behaviors during undo.
Then you can describe what you would like to have happen differently.