Design: Rolling up Corporate Forms from all Intranet Department Sites

I'm working on creating a rollup content Query Web part (CQWP) to display all the corporate forms listed within our intranet. The basic architecture was to create a custom content type as follows:

[Corporate Form]
From preexsisting columns

• Title:Single line of text
• URL:Hyperlink or Picture
• Comments:Multiple lines of text
• Owner:Person or Group

New custom column

• HelpURL:Publishing Hyperlink

Each site will have a list to store the [Corporate Form] content type. This list will allow administrators to add an entry for every corporate form either as an attatchment or a link to another list (such as for Infopath or standard lists).