Slight improvement of the older one. Yours sounds more SMW-y. If you wanted to approach to the original more, I'd suggest using a @0 with a constant ADSR (i.e. $ED$7F$E0), since that's what the original does, and eventually truncating the main melody's ending note (for each channel) by atleast a half.
It's still okay, though.