Oda confirmed Luffy's fruit is the Hito Hito no Mi, Model: Nika in chapter 1044. But go back and look at how his body was always drawn: cartoon physics, impossible stretches, that grin. The fruit was "Gomu Gomu" in name only for a thousand chapters.
Was this the plan from the start, or did Oda find it along the way?