That's my plan if I can get enough bolt out. I have about 1/8" of the top half of the broken bolt that would work for a guesstimate (not enough to use the thread checker tool, but probably enough to find the size. I thought someone might know.
As for the, oil dipstick, I don't plan on removing...