I recently came across this series on Coursera, Introduction to Logic and Critical Thinking Specialization: https://www.coursera.org/specializations/logic-critical-thin...

I haven't started yet, but the syllabus for each course seemed interesting and covers off on the thinking part. You can take the classes for free if you audit them though the website throws the payment option at you.