Yeah that bugged me in season six. Gradually, the further we got from the opening arc, the more random things became. Episodes can still be enjoyed individually, but the season's structure is made wobbly by doing things like Who Mourns For Morn. It kind of continues into season seven too.
I still enjoy the episode though.