Diff Geo was along the same lines as you describe, although I didn't take it after the manifolds & differential forms part in analysis 3 was enough for me.
The definition of the derivative was the simple one in analysis 1 - but in analysis 2 we were also hit with the banach space definition lol