Front suspension reassembly - is this right?

.

 

That's all correct and nothing wrong at all.
The lower one will slot straight on, the upper needs lifting onto the bump stop arm and once back together with the hub, you'll be able to get the stop on.
When you hammer on the top one, keep the locking screw finger tight and continue to finger tighten as you tap the arm home. When the screw stops turning into the dimple you have the arm on correctly.

 

Don't forget to put the rubbery rings on the arms before you fit them

 

.

 

.

 

I'm all about the technical terms