I had this same exactly problem with my Elantra 2009 and as you said… it was the solenoids. Bought them on eBay and took me like 3 hours to do it. It was my first time and everything went well. I also changed the filter and put new fluid. This solved my problem. Now it shifts smoothly.