Yes, by bringing the eternal mind-continuum ("soulriver") into the equation it can be solved, saying that there is no such thing as end of rebirth, end of dependent origination, end of samsara.
Well this is loaded. The mind-continuum is in a sense eternal in that one moment of mind conditions the next moment of mind. Ultimately this is transformed into wisdom and in that sense the mind ends.
As for no end of rebirth - yes there is an end to rebirth. The problem of rebirth for ordinary beings is uncontrolled rebirth driven by karma and obscurations. There is an end to that.
There is no end to samsara except for the individual because beings are actually infinite. We will always be dredging the depths of samsara.
On the other hand, this eternal mind-continuum sounds, well, like a liquidified atman, with the result that one's mind is eternal, this time a changing, moving, feeling mind, not eternal in components but eternal in continuum. So, like a river and its drops, the rever is eternally flowing but the drops keep changing. Funny, it is much like the reverse of the view that there are eternal elements (dharmas) making up an impermanent whole. Is this really an acceptible view?
The river analogy is just that - an analogy. One moment of mind conditions the next and gives rise to the next moment of mind. Actually we should look at the Abidharma teachings on this. Mind is however not a thing or entity but a Dependant arising. Therefore it is not an atman.
_________________Kirt's Tibetan Translation Notes
"Only you can make your mind beautiful."
HH Chetsang Rinpoche