AfterEffects: How to make shape move with Trim Paths end?

https://www.youtube.com/watch?v=I0JxRdfJtTE

I have followed the above tutorial, but my shape is bigger than the composition, I want to follow the trim path end until the end of the shape, but keeping it in view at all times, so the shape needs to also move to remain on the composition. 

Is there a way to do this that's not just laboriously moving the shape's position every few frames?

Would really appreciate any help! Thanks!