First off I would like to say that I have really enjoyed your story so far. It has really cracked me up at times. There are very few cynical!Harry stories out there.
I also like the way that Harry inadvertandly discovered the stone and stuff. I like both options one and two. I would like to see Lockhart really put in his place but I also enjoy AU stories as well.
In the end it's up to you to decide as the author obviously. I can't wait to read more so keep up the good work.