Also consider the "grade" of buff you use. They generally run flannel, soft cotton and a "domet" buff, hardest to softest material. Mixing the buffs with different compounds will give varied results depending on what grit sanding you stopped at. In this case, I think you could start with a soft cotton buff and fine grit on your 2000 grit sanded finish, then go to a domet buff with fine grit. That may be all you need, but your eyes will tell you.
An aside, if you are going to continue with finish work on more guitars, I'd finish up some test pieces of wood, sand them to what you think will be your "standard", then buff them out using various combos of buff/grits to see what works for your situation. Cheaper to learn there than on a finished guitar.
of running a small crew of guys fixing up close to 10,000 "Made in India " Strats for Fender back around 1990 while working at Carruthers guitars. Two of us buffed finishes for 7-9 hours a day, 5 - 6 days / week for approximately 10 weeks. Once we got back to our high end custom instruments, the finishes looked incredible.( Not to mention how strong our lat muscles became!) Lots of practice there.