First of all-Relax! The more u want something, the more it'll wriggle out of ur control.
what I can tell you about Pak affairs is that, these days, the paper carries more contemporary issues than textbook stuff. for such subjects u need to develop a solid opinion about issues around you-obviously the ones relating to Pakistan as we see today. You also need to learn how to merge related arguments together when writing an essay on the subject. You need to note down growing trends in our society. Its more like Current affairs than a conventional Pak affairs ppr. Ikram rabbani is the standard book in this case. stick to it.
for EDS, try Kashmiri. I also had Dogar's EDS book (forgetting the actual name). Mix n match from both but use Kashmiri as the main one.