Are these flip flop conversions correct
Simply put - Yes, your schematics and tables are correct.

*Side note, you can find examples of these anywhere on the net as this is a typical study for undergrad elctrical engineering majors.