coolant in the oil

This could still be a head gasket issue and you caught it in time to save yourself a lot of money. If you take the oil filler off and look at the inside top, if it looks like "Chocolate Milk" then you have a blown head gasket. If you are noticing your car is idling rough then it is intake. At any rate I would do a complete head gasket set. The set includes all the gaskets for the whole engine which allows you to have the knowledge that nothing should be leaking at all.

If you read up on DEX-COOL COOLANT, you will find out that it is linked to eating intake gaskets and that is most likey you problem! If you wait to long to fix it you may wipe a bearing! and your engine will be toast!