Your proposed modifications sound good, be sure to properly credit all music and art including that made by you so we know what work went into the project changes.
