You could continue your current method and begin attaching (grouping) the notes to the dimensions.
Use control key to select note & dimension, then right-mouse button>group>group. This will keep them together if moved.