Thank you!
I didn't want the motif to be over the entire song because then it feels out of place IMO. Having unique sections outside of the motif is important to make the motif stand out is a key aspect of making the song flow nicely I think.
Can I ask what you mean by "stretched it a bit too far"? like is it the length of the song or something else? just wondering.