Your proposed modifications sound good. Be sure to properly credit yourself for creating the music in your final submission.