Leo Kottke is probably #1 for me esp before his hand injury when he'd play fingerstyle with fingerpicks on a 12-string. Had a really muscular but clear tone.
Tommy Emmanuel very close behind though LK edges him because I prefer his material. TE is most definitely best experienced live as he has great stage banter as well as fantastic skills.
Two other brilliant fingerstyle players are Scottish celtic folk specialist Tony McManus and the late Pete Huttlinger who used to play with John Denver
Electric wise I lean heavily towards inventive and distinctive post punk players like John McGeogh (Magazine and Siouxsie & the Banshees), Terry Bickers (House of Love), Keith Levene (PiL), Andy Gill (Gang of Four) and Geordie Walker (Killing Joke). Hard to separate out these five.