For these last 2 edge cases, you should try to solve pieces by pushing out the spot where it needs to go, then solving the edge by flipping the edge you want to solve and placing it back (sorry if you could not understand)
So you would solve that case by doing 3D' L' U' L F' L F L' 3D to solve the green-white wing, then 2U' L' U' L F' L F L' 2U.