For overlapped songs Replay Music is probably the best solution. And it is very nice that you can split the songs with it manually by hitting the "Split now" button.