Hahaha, I really like how they break up that wholesome moment with such a comedic scene. It just made the mood a lot better. That said, I really like the gags in this episode. Seeing Shirou become such an enthusiast had me giggling.