Honestly, at the rate each new Jedi is getting trained per franchise, the next Jedi Padawan will introduce their name to their master before becoming deemed a Master.

Thought it would be funnier if we added Leia

Is a dedicated mp3 player out of the question? Would be a simple solution that doesn’t require any internet access for when you’re in areas with poor reception.

Option 1 will work for a while. The only thing you will need for the near-ish future is larger storage. Games nowadays take up so much space and 1 TB won’t last long. Would recommend buying a 2-3TB HDD while you’re at Microcenter. They may even be able to install it for you