Might go with Kokoro stumbling into the church.

As for extra characters... well, should probably give Yuuka a rest for once and consider something else.