1995 BMW 540i rough idle

It runs well but from time to time it goes to rough idle. When it does this I unhook the MAS for a bit and then drive like 15 miles and hook it back up. When it goes into rough idle it doesn't shift the way it should. It goes up to 4500 rpm before it shifts. I have a check engine light for O2 senser. I replaced them and they came back on 2 weeks after I changed them. That was a year ago. I have changed the MAS. It use to fix with a bottle of heat, but that doesn't fix it any more. I know the O2 sensers needs changed, but will this fix this problem