OK ignore my last post :) I replaced the upper control arm and the clunk is now gone. Also the very slight vibration in the front that I was thinking I needed an alignment is now gone too.
The control arm seemed solid but the ball joint developed a squeek so I thought I should tackle it before...