I had a similar problem and went through a ball ache experience. I had lumpy start-up/idling when cold, bubbles in header tank and coolant in oil.
I replaced head gasket outside in January in Holland (ouch!).

Problem immediately returned
Had head pressure tested, leak was between water jacket and inlet port. As the port is not under compression I was confused as to why bubbles were coming through to the header tank
I invested in a new head and fitted it. Same problem
I took to local Cit dealer who pointed out radiator was cold - it was blocked. 2 Radiators later (1st one was broken on delivery), no joy. Although this sounds unlikely, I assumed it was the block

, either that or the new head was porous too.
Eventually, I got a recon engine which is still going fine. It was a frustrating and expensive experience.
Clearly, I hope you don't go through this but the above may prove helpful in some way
