Replaced my AOS. Not too difficult. I was surprised that my new AOS from the dealer already came with the bellows piece, didn't need a new one. Didn't have a tough time getting the new one on with the spring clamp vs using a hose clamp. Still had some smoke the first few times I started it, but the smoke got less and less and more importantly there was no longer any rough idling.
I also managed to re-fasten one of the heat shields over my catalytic converter while I was under there. Used 1/4" bolts that were 3/4" long. 5/8" length would have been ideal. Comment u-clips and washers to go with them. If they get loose, I'll just change to lock washers.
Thanks everyone for their help!