Looking for some advice or suggestions,

Many of us take photos while hiking. Some people take photos that are worthy of publication. And some people just use the photos like a diary. But regardless of motivation, the photos accumulate.

So, the question is:
How do you differentiate between the summit you're standing on and the summit you're looking at when tagging a particular photo (in Adobe Lightroom, Adobe Bridge, or whatever software you like)?

e.g. I'm standing on Hollyburn Mountain and take a photo of Crown Mountain. I'd like to make the photo searchable by subject (Crown) and by where I took it from (Hollyburn).

Currently, my metadata is incomplete and/or messy, and I'd like to clean it up.

tag both of them.

When I upload photos to flickr I tag them all with the name of the destination/trail (and sometimes the general area i.e. Howe Sound, Coquihalla, or Garibaldi Provincial Park), as well as any peaks/landmarks which may prominently figure in individual photos.

Yes, pretty much what I've done. I was kind of looking for a way to be more specific.

Using my above example, let's say I want a picture of Crown Mountain, and I type in "Crown Mountain"...the problem is, I'm going to get a crapload of results of photos from trips there (people on the trail, a flower or mushroom seen on the way).

I suppose I could go "location:Hollyburn", "subject:Crown". Maybe I'm thinking too much about this. Time to go hiking