Hate to not answer the question but I'd heavily suggest Albert Lee. The king of finger picking. Amazing.

http://www.youtube.com/watch?v=kGU63KqXuZk

I mention this because all of these guys eventually refer back to Albert. Heck, even Hendrix was in awe of Albert back in the day.

I think both players you mention are fine players in their own right but Albert is the master.