What team without Grievous should I farm and gear to unlock 7 star Padme in 1-2 months (next return)

LOL - a year for GG - I have one account started in March 2017 that's still looking at a 5* GG. I think he drops more from GW than he shows up in the shop. Maybe I've just stopped taking the 2 seconds to scroll down. Who knows. Either that or he and Logray are having some odd inter-species love tryst which is why I never see either of them.