You are correct about the fan or rather the heatsink connections. Some of the later Core Duo MacBook have the same connections as the Core 2 models so you may not need a new heatsink/fan. Early Core Duos have what is called a 4 wall connection (vertical) - the late 2006 and mid 2007 Core 2's have a 3 wall (horizontal) connection. If you look at the fan connection on the early Core Duo then the early 4 wall connection is similar in style just a narrower connection.....
What you want to avoid is the late 2007 onward logic-boards which have totally different heatsinks, fans, speaker and bluetooth connections. They have a different style bottom case and the 2 are not interchangeable.
If you have a Core Duo then you are limited to the Core 2 Duo 1.83GHz, 2 Ghz and 2.16GHz logicboards.