If his wake time is 5:30, bed should be at 5:30 for a 12 hour day. Is there any reason that you are on a 13 hour day? When we dropped the catnap Kaitlyn goes to bed when she needs to, sometimes she can stay up till 7pm, but if her A times weren't there, we will put her to bed an hour early. This does not effect when she wakes up the next day. Have you tried putting her down for the night at 5pm instead of the catnap?
You never know that they are not going to choke! I watch her like a hawk. That said babies DO know what to do with food when it goes in their mouth at this age. Even if it gets partially stuck, they can cough it up just fine. I started by feeding Kaitlyn VERY small pieces of bread and rice rusks by hand (so small that it could not get stuck in her windpipe). She loved them. Just watching her, I could tell that she was handling the small pieces really well. She would sometimes cough one back up, but I think small accidents teach them how to eat properly. She now will eat cheerios, steamed carotts and pea halves really well.
One mistake that a lot of people make is they do not give a child time to try to cough up a piece of food that went down the wrong way. As scary as it is to see your LO coughing because he choked on a piece of food, if he is coughing, then he is doing fine. Coughs are very powerful and are the best thing to dislodge the food from the windpipe. If you start frantically patting them on the back, it can actually do more harm than good and actually can make things worse.
It is scary ANY time you start finger foods. Good luck!