Question about uniswap pool

Hi there. Early in my crypto voyage I made the mistake to stake a relatively small amount of weth/wbtc into uniswap's pool. Now that money has grown due to the market changing but the earned fees are almost insignificant. Now the problem is that they are basically holding these assets hostage due to the fees required to withdraw it. Withdrawing now would negate any profit I've made over the past few months, even at 60 gwei.

The question is the following : with EIP-1559 and eventually the move to PoS, can I expect that the situation will change and drastically reduce the fees to withdraw from the uniswap pool? Should I wait?

Thanks!