UPDATE: I do smell gas in my oil, but the oil is not thin and I can read it just fine (1000 miles of driving on this change, most of it a long highway trip at interstate speeds). Just a quart low. I added a quart this evening and will re-measure in the morning before work.

The EGR should be here Friday and the plan is to swap it and the PCV this weekend (Sunday). I'll clean out the tubes as well.