Okay, so I made the changes using a pair 1nF's and 4.7nF's and it works without that oscillation. The volume problem I think is more that you loose certain frequencies and overall beefness with a wah rather than a unity gain problem, which it does reach unity.
So your layout is verified. Thanks