Not that my opinion matters imo (I have done runs of the various categories in the past, but don't have them submitted and probably won't still), but everything looks good. Personally I'd add a category for getting to the end of the Extra stages, and one for getting to the end of the battle stages, but that's probably just me.