I'd work with what you got. Granted, I'm biased as a botanist that focuses on
native northwest plant species ;)
Any of our native berries should do well -- hucks, blueberries, native blackberries (avoid Himalayans, they'll choke out everything), salmonberries, and thimbleberries are normal succession fruit plants for our conifer forests. Jeremy nailed it with the huckleberry recommendations, but I'd like to add that evergreen hucks are also a good choice for low altitudes and closer to the coast. You can slowly begin correcting the acidity of the soil without losing most of the above berries, with the exception of hucks and blueberries. Fill in those holes with other fruit trees as the soil profile evolves.