A tablet is not a laptop replacement. Do you play DVD's to watch movies? If so I would go for a replacement laptop. Personally I don't consider a tablet to be a stand-alone device eg an iPad needs to sync with a desktop or laptop. Windows on a tablet is poor (see all the reviews). There are some good article about this subject on this site. There was a good artcile in the latest PCA magazine about the merits of a laptop compared to a tablet (laptop wins).
OnePlus 5 review