there are polymer-modified repair mtls that ' feather-edge ' but they're not avail at apron stores so head for a pro const supply house,,, just remember - good PREP's the most important part of conc repairs.
if it were mine, i'd pressure wash existing masonary 1st, complete the floor repairs 2nd, o'verlay the whole floor 3rd, & place the design'd floor INTO the conc o'lay possibly including an acid-stain,,, you may wish to use hardi-backer & tile or whatever.
caution - you'll need suitable sealers for existing walls allowing easier future cleaning,,, this is our work so its easy to plan & complete,,, you may find it more challenging

good luck !