Question

Hello Rabbi,
God willing, this coming Elul I’ll begin learning in yeshiva (Har Etzion). During Elul and the winter semester we’ll be studying tractate Gittin. To prepare myself, I decided at the beginning of the break to go through the tractate for breadth with Gemara, Rashi, Tosafot, and commentaries, and with God’s help today I started the ninth chapter (God willing, I’ll finish the tractate by this coming Monday). 
The problem is that the evening study session is usually devoted to learning the tractate for breadth. Seemingly there’s no point in going over the tractate for breadth again, and certainly not in devoting several precious hours to it every day. So I’m debating what to do instead during the evening session. 
I thought of three main possibilities:
A. To study yeshiva-style books of later authorities (Acharonim), in order to sharpen my analytical learning skills. The yeshiva has a pretty strong Brisker approach, but maybe it’s דווקא better to expose myself to different modes of learning (like the Chazon Ish, for example). Or perhaps it’s still too early to “move from Ponevezh to Slabodka.”
In any case, is it recommended to study books of later authorities on the tractate itself, and on the topics being discussed, or specifically in other areas? And does the Rabbi have recommendations for specific books?
B. Jewish law. I’ll most likely enlist at the end of the summer semester, and it’s important to me to know Jewish law well when I get to the army (mainly Sabbath, eruvin, and prayer), so that it will be sharp and ready on my tongue. More generally, I think it’s problematic to be able to propose fine distinctions about the bond of levirate marriage while not knowing the laws of selecting and muktzeh. I don’t want to stammer when basic questions in Jewish law come up.
If I study Jewish law (it would also be possible to devote only part of the session to it) — how does the Rabbi recommend doing that? Tur and Beit Yosef and from the Talmudic passages, or דווקא contemporary books like Peninei Halakha?
C. I’m also interested in types of learning that are not classic Brisker-yeshivish styles. Maybe I should work on the literature of the Geonim, the Talmudic interpretation of the medieval Ashkenazi authorities / medieval Sephardi authorities / Tosafists, or the halakhic midrashim (a field that really fascinates me, and that I want to give proper attention to). I’m also interested in the academic perspective on the Talmud (I once heard a general lecture by Rabbi David Bigman and enjoyed it very much. Not long ago I also started studying Seridei Esh, and his use of academic methods together with lomdut seems wonderful to me).
Or maybe I really should go over the tractate for breadth again? Or perhaps read Spinoza’s Ethics? 🙃
As an aside, I’ll add that the evening study session is usually with an older study partner (from a more advanced class), with all the implications that come with that (it’s possible to handle difficult books and texts; “superficial” Jewish law study is less relevant, etc.). 
In short, I’d be happy to hear the Rabbi’s opinion on the matter.
Thanks in advance.