Thanks for the tweaks.
The chart you provided is quite close to the original arrangement now (and definitely plays as I described it). There are some details (especially in the ending) that aren't...