I used the WD-40 method to pull them both off. I had to use a screwdriver to get the straw to go in. The dish soap made for a nice tacky glue that never really dried. I'll probably use alcohol to put it back on. Another trick I heard was hair spray to help it slide on and then lock it in place once it dries.

Bonus: The shifter is OK. I just had to give it an attitude adjustment.

Thank you to both you guys!!