Honestly if you really want to develop games then stick to that, So I am currently in my last year of university and I have been studying game development. The only reason I chose game development is because I though it would be a fun way to learn programming and it is, however I always wanted to make software and I have been making software for the computer science modules. The difference between making software and games isn't that big since the major part is understanding programming in general, this includes OOP (Object Oriented Programming), data structures, design patterns and etc.. In game development you would just apply this knowledge using the game engines.