#1 Lead Reports Inaccurate due to weak business logic

Once a lead is promoted to an account I loose the historical data for that lead.  

So when I run a lead report that lead no longer displays in the result after it has been promoted.

As a result of this logic my lead report metrics are off.   As a sales manager I need to know how many new leads we are generating as a company on a weekly and monthly basis.  This logic makes the lead reports innacurate. 

#2 Campaign  Reports Inaccurate due to weak business logic

The campaigns module allows me to associate leads to campaigns.  This is great BUT as soon as a lead is promoted to an Account the lead disappears from the campaign view. As a result, I have no way of measuring how many leads that campaign actually generated.  

Please advise.   And I hope that the solution for #2 is not to create more sales opportunities because that will just clutter my screen.  I only use opportunities for customers that I have submitted a quote for.