Thinking of buying my first Thinkpad

I am a 3rd year electrical engineering student currently using a Dell Latitude E5470 for all of my school assignments and projects and sometimes the programs I use either freeze, move really slow or just crash entirely which is getting pretty frustrating. It has a i5-6200U CPU with 8GB of RAM but it doesn’t manage to keep up with programs like Simulink, Capture CIS or Vivado. The battery is also pretty burned out, can’t really keep it open more than 5 min without having to charge it. From what I’ve seen online it seems like a Thinkpad would be the right move for my needs but I can’t really tell which one would be the best fit.