Your proposed modifications sound good. Be sure to properly credit yourself for composing the new songs.
