Here's what I use for my mash volume calculation:
total volume (gal) = 0.115*lbs_grain + mash_water_gallons
I originally used this calculator, but found that it underestimated the volume of the mash and I had to leave out grains:
I notice they also have a mash temperature calculator, but I've never used it.
Hope this helps.