Which turntable should I choose?

Seeking assistance from the TT gurus here. 

So far my experience with TT's has not been especially gratifying. A local dealer convinced me that the cartridge is really the only thing that mattered. So he sold me a TEAC TN-400s paired with a Ortofon 2M Black cart. The TEAC had a rather annoying hum no matter what phono-pre I used, except for the one built into the table. The cart showed every wart and flaw on the record, in other words it was not very forgiving, despite me cleaning my records well with an Oki-Nokki. 

I sold both the table and cart and want to try again from scratch. 

I want to keep the table under $2k. I've come across two tables in my research that interest me.

- Technics SL1210GR from HiFi Heaven. I'm not really sure what cart to get but I'm leaning toward the Hana SL Low Output Shibata. https://hifiheaven.net/shop/Technics-SL-1210GR-Grand-Class-Direct-Drive-Turntable-System

- A restored Thorens table from Vinyl Nirvana. https://vinylnirvana.com/vintage-turntables-for-sale

My current phono-pre is a Consonance PM6.

Questions:
- Will either of these table options provide sound quality anywhere approaching my digital setup (Bluesound Node 2/ Mytek Libery DAC)? 
- Are there better options in this price range that I should consider?

Thanks for any and all replies.
Joe