Thinkpad T500 is also very good for your usecase. You can swap the built in hdd or an ssd, and put the old hdd in a hdd caddy in the place of the cdrom.