I don't agree that the thesis and the answer are different things. Your thesis is the argument for THAT question. Building a structure with potentially useful ideas is not a thesis - that's just sound preparation.
OK, intros: I would definitely include the texts BUT I think what your friend...