I would do the block now and do the heads later. You will likely see more gain with doing the heads straight off but I see the heads as an easier bolt-on upgrade later down the road. With a stroker you will probably run out of breath at around 6k with the heads you have now.