Excel 2007 : Automating formula cell values to maximum sheet rows

Hi
I'm having awful problems trying to simplify a report so that users can simple drop in some data and the relevant formulas are updated;

I have a number of sheets - Calc, raw and front page, my formula checks two columns (B and D) on the "raw" sheet and if the values are correct gives me a the sum on the frontpage, this works fine

=SUMPRODUCT(--(raw!B2:B125=A16),--(raw!D2:D125=B13))

The current total number of rows in the raw sheet are 125 but this will increase or decrease based on the data added to the sheet.

I have a simple formula counting the number of populated rows on the calc sheet and I wish to replace the B125 and D125 with B(Calc!M2) in order to automatically update the correct number of rows as it changes.

Calc!M2 has the following formula giving the current value of raw!B125

="raw!B"&COUNT(raw!A:A)+1

I have tried the INDIRECT function but cannot get it to work.

Any help would be greatly appreciated as I am pulling my hair out