Basically yes, except that when I say track assign that is track assign in the sequencer record & edit menu, not track allocation in apc to smf convert which is different. There you will find you can change the assignments exactly as you desire including tracks 4, 5, 6 which you are not changing at the moment, then you do not need your changes in Power Tracks or bother about midi channels since it is all taken care of in the 7k. As you say melody tracks come out fine and need no conversion, only if you want to insert controllers after the event.