["do I cut out the solder joints, remake new flex track and make modified joiners that will line up the tops of the rails where the two different codes meet?"]
In my opinion this solution is better and BTW, it is the one recommended in every modelrailroad building tips book..?