I have needed both these features, and add my vote to both your suggestions. Regarding Suggestion 1, Pod::Usage is an excellent solution where it's relevant, but it only covers a narrow set of cases. There are many cases where information needs to be in both code and documentation, especially version related information.

I've also needed your Suggestion 2. I try to make documentation convenient for whoever will maintain the module (and so make it more likely to be maintained), and to make it readable for those who use the module. It's often tough to put code in the module, in the right place to make the user documentation come out the way it should.