TogetherSoft's Together did a pretty good job of the round-tripping, with the primary focus on the coding editor but diagrams when you needed them. It kept the two in sync very well. Used that around 2003 IIRC. They got bought by Borland and then spun off.