M.W.
One thing that you can try and cut down on choking risk is the mesh feeders. I used them with my dgtr around that age (maybe older) and she would eat fresh fruit or the teething biscuits (she had almost choked on a large chunk she got off one day - so I didn't give them to her straight again) in them. She LOVED them! He sounds like he could be ready for finger foods - just make them really soft and let him try them! But the mesh feeder things were great too for a little more independence so I didn't have to watch every bite she took (she would STUFF her mouth FULL - still does - 26 mos old!!).