Nothing will be in stock. I'm still waiting for parts for my 06. You already figured out they are different I think 05 and earlier are straight gears and 06+ are the angled gears. If I was you I'd do the headgaskets. I ended up buying a full engine gasket set and it really isn't much and better piece of mind since it's all taken apart anyways. My rear head gasket was leaking so you may want to just put a new one on just to be safe. Seems like a few of us are having some tranny issues. What mileage were you at?