Yes, #2 is what they should've done from the beginning because the quests themselves are boring as hell - the cutscenes are great but mind numbingly boring getting to them.