Unfortunately I'm not sure about 2007, but in 2010 you can hover over a shape and arrows will appear on each side, and if you click the arrow in the direction you want the connector to go, it will auto-connect it to the adjacent shape. It uses the default connector, but there's a way to change that, I think by using themes. I can play with that if you think this will work for you.