I agree with everything you said, except I personally liked the FFXIII-2 combat more than FXIII. Faster paradigm switches (I really hated that first, loooooong switch in every FF13 battle), your “leader” can die, and more flexibility with developing the roles of each characters.