Attach Line shapes to Cells or other shapes so that lines move when sorting

Question

Thank you for taking the time to read my questions.

I have VBA code that draws arrow shapes between two cells, however if I sort the sheet. the arrow shapes do not move and as a result the arrows start at and point to nothing after the sort.

I have added shapes (square) to my sheet and they move and size with the cells when I sort, but if I connect 2 boxes with an arrow shape, then sort, the boxes move but the arrows don't.

Is there a straightforward way to move arrows start and end point after sorting or do I have to recalculate where the start and end points are after each sort and then move the arrows accordingly?

Thanks!