Yes, I use the pool hash rate for the block (although for Kano it is estimated until someone uploads their rewards which most people are not doing - I did that this morning).  Also a key point of interest is that with the 400Ph rate, the 5nd ramp up time is WAYYY less than at 45Ph (around 5 days versus a month).  I had added 2 miners that were slowly building but they are pretty much fully there now!  Interestingly, the last 3 blocks in one 24 hour period were about the same as all of last month!