I just mash at 1:5:1 and then add the water (sometimes a sparge, sometimes not, depending on how I'm feeling) to fill up my kettle to the pre-boil volume after the mash is done.
Also, I understand that a mash out at 170 is unnecessary as you are removing the grains after the mash? I've done both...