You're right; 3d6 is too low for 5e math. 4d6 works better.
I like the idea of Warlocks with their Patrons over the Vancian Wizard. Just like the Cleric and their god, I think Patron dependency attaches the PC to the setting and gives them some extra flavor. My opinion is heavily influenced by...