In fact, the holy Quran emphasizes and sometimes repeats the same topics, subjects and stories due to importance of the message that lies in those things or sometimes Quran tells a story but means the same characters found in all eras like Moses and pharaoh. There are some books written or compiled especially in Persian that which topic or topics the each surah emphasizes on or discusses. Yes, you are absolutely right that we should look at every Surah as a whole to understand what the surah emphasizes most. In some Surah there is a story so it's verses are put in chronological order like Surah Yusuf but overall the place of verses in Quran is "tauqeefi" (meaning the verses were put in the suras as per order of the Holy Prophet (PBUH) to his companions according to the guidance of Gabriel) therefore the sequence of the verses is not the same as revealed on Holy Prophet (PBUH) so it may felt sometimes when reciting and reading the meaning of a Surah that the sequence is broken.