Your proposed modifications sound good, be sure to clearly credit yourself in your final submission for the new music.
