My own Ultimate Edition has been tweaked:
01 Overture (Breath of Life)
02 Reaching for the Sky (Breath of Life)
03 Higher Than the Morning (Forevermore)
04 The Darkness in the Light (Forevermore)
05 Swing High, Swing Low (Forevermore)
06 Bully (Forevermore)
07 Rainbow Sky (Forevermore)
08 Looking for the Light (Forevermore)
09 The World We Used to Know (Forevermore)
10 Owl Howl (Forevermore)
11 Solitude (Forevermore)
12 Belong (Forevermore)
13 Lonesome Rebel (Forevermore)
14 Looking for the Light - reprise (Breath of Life)
15 The Greatest Story Never Ends (Breath of Life)
16 Love Made a Way (Breath of Life)
That works just right. And flows great. Owl Howl has a natural start, so going from the fade-out of The World... to that works perfectly. I can deal with Pete's rough vocals in Solitude, but not in The Sun Comes Out Today; those are far worse and sound like me on a bad day (and I can't sing to save my life).
Losing The Sun Comes Out Today and the Love Made a Way prequel was easy. And I will treat Can You Feel It as a bonus track, ala Spinning or Lenny Johnson, that I will listen to on its own. Already deleted both of the full versions off my phone and updated it with the above Ultimate Edition, and I don't see any need to tweak it again.