Yes, they should both totally work there with not!Dad and the sleepy neighbor girl... :3

I actually only got interested in the canon in the first place because of Chiaki spoilers! And I'll definitely keep you on the list of "people it's okay to spoil if necessary", in that case... ^.^