Berklee Press has some excellent books with what you're looking for, one in 3 volumes by Will Leavitt. There's another that's more barebones but covers the basics well by Hal Leonard. The former, especially, essentially starts at notation first and then only later introduces tabs when it feels like it. Very challenging if you've been tabs-only, but very rewarding.

It's an exaggeration, but working through them will make you learn the guitar as an instrument for personal expression rather than just a means for playing other peoples' songs.