All the 3 forms are good but first it's > Je n'avai**s** qu'une envie... (check the Bescherelle) Then i would say that "celle de" sounds weird when spoken (i am a native french speaker), it isn't incorrect but it makes the sentence a lot heavier. Generally you would say: > Je n'avais qu'une envie **,** repartir sur de bonnes bases. Which is shorter but still very formal. > Je n'avais qu'une envie, c'était **(de)** repartir sur de bonnes bases. This is still good (the "de" is optional) but heavier too, i would suggest you keep to the short form but it's more of a personal choice. The same applies to your second example however the "de" is not optional in the second form you suggest cause it's followed by "tout". As a sidenote only use the "points de suspension" (...) when it's a dialog, they don't look good in text.