Looks like both were bad, that's always fun.
Regarding front end noises, before my springs broke, I had an ugly clunk noise I couldn't quite figure out, but after some youtubing, found a video that had the same sort of clunk I was having and it was talking about sway bar links. The previous owner installed what looked liked very beefy and thick aftermarket sway bar links. When I took a look, they were the ones that you fill with grease, and while installed, they didn't really move about when pryed on gently or moved by hand, but they were full of grease, so I suspected they were leaking. I decided to remove one as they are easy to get off, and of course, one end was wobbly and crunchy. Some part number searching revealed they were garbage mevotech brand. Ordered some febi bilstein links, replaced, and clunk was gone, so might be worthwhile checking out your links