Questions about this for school

Hello Wonderful people!

I have a few questions. I mainly want a framework due to the right to repair aspect and the ability to upgrade at future points as needed

I'm getting this for college. Other then coursework I pretty much will only be watching videos, streaming from my jellyfin server, and very light gaming (think Celeste).

I wanted to know if I should go for the i5-1340P or the i7-1360P Framework 13? I doubt I need the processing power so much as I need the battery life. For context my current laptop has a Intel i7-10510U and a 73Wh battery. As for memory and storage, I intend on recycling those from my lemur pro which has 16gb of ram and 1 tb NVME.

My other question is if I should buy the 13 or wait for the 16 in general? I assume I could upgrade the 13 to the 16 specs at any point if I understand this laptop correctly. I want to ensure that I can just buy this and keep upgrading as needed.