You're already headed in the right direction. Knowing he could be on a fd is part of it. Expanding that range with a range you gave him pre is part of it too.

You'll almost never have time to figure an accurate range and figure equity at the table so praticing with a range tool like pokerstove will help. Running different scenarios thru stove over and over again will make it more second nature when you're at the table.