For layering of many voices with great harmony Steve Howe from YES is awesome. Try Quantum Guitar and Turbulence.
Allan Holdsworth's Live CD called ALL NIGHT WRONG is the best live recording I ever heard...its expensive though thru www.audiophileimports.com
Richard Thompson's CD's have tons of incredible fingerpicking style...
Check out YES's Relayer album,,,,its basically what I consider the best guitar playing on any album period..