just record more takes
I basically always record the whole track. until the end of song.
and some variations of the track.. loop a little bit longer/shorter, more and less release/attack. and so on.
Then you have everything you need..
it takes a little longer, takes a lot of memory.
but maybe it saves a lot of trouble later