and maybe learn to start working in session from the get go.
thats the best way of working IMO if you're aiming at playing live sets with live stuff and not just DJ or play your prerecorded tracks or pre-made arrangements
my way is this:
have a single live set BOTH for composition and live play
all our songs use this same template, and we create first in session view, each new song being composed under the last one. we use a launchpad, (8*8 pad matrix), so we configured the set with 8 main tracks (or tracks groups) for launching clips, and limiting to 8 scenes per song (sometimes difficult not to override). All the other tracks are for the hardware synths, audio busses to tweak the drums, bass, synths, samples differently with compression, etc.
so all our songs follow the same live template.
then we play live, play live, play live.... then we have some new ideas of good arrangements for this or that song, then, when we are sure about the arrangement, there are 1 more steps to achieve a finished song:
=> record the arrangement, while playing it in session view, then be obsessionnal and edit the hell out of this arrangement (everything we do live must be automated here). Then we export / bounce the tracks of this arrangement and go mix it somewhere else (I prefer harrison mixbus for this step, but all is also good to stay within live), to have a proper track to share with our DJ friends and make the whores on the internet (listen to our new track!!)
so you can see our way of working is antagonist to yours, we begin with raw material, live play, then we progressively work on the arrangements and mixdowns of tracks.
at the end, be aware that our way of working leads to a point where you have your live songs and produced songs that differ from a bit to sometimes huge gap, especially if we enrich the sound in the mixdown process, and also because all is automated for production, whereas nothing is automated in our live set (but we got 4 hands and lots of pots and pads to tweak)
cheers mate and good luck