I guess Fedlman book is more than enough for paper 2 as well. Personally, I will prefer Feldman any day over Sheher Bano. Very precise..You just need to make headings while writing from Feldman and you are done.. It's the best book if you are studying Psycho for the first time(may be you need to have some basic concepts beforehand)..