Many thanks!! Yes, I agree on more time/less stress (as soon as I wrote this, I think I knew the answer!)
The train actually leaves from Chamatrin, not Atocha (latter is near Estacion Sur). Chamatrin is for the northern trains and on the northern side of Madrid.
Good point on arrival time...