The p-type being on top is correct (I can't remember that question in the 2004 HSC).
To quote the Tipler uni physics textbook... "When incident light strikes the p-type region, electron-hole pairs are created, resulting in a current through the load resistance [ie the external circuit]."