Don't tie the papi and the approach course..
There is a reason why you were given VOR Z or VOR Y (let's say the runway course is 080, Z is 075, Y is 070) and not ils or rnav, it can be because of terrain on one side of the course or maybe one or two restricted of dangerous areas in close proximity to the airport...
At night I will turn visual only in the circling area