These books are enough.n do practice by writing all shair-o-shairi.as without practice by writing it becomes really difficult to recall poetry during paper.
I have also no background in Punjabi but only advantage we have is that it's our mother tongue so all other things need effort n understanding.
Prepare according to syllabus n if you want good score then solve past papers n in this way you can judge your weak areas.