AirPods losing charge and disconnecting

Hi! I've had my AirPods for about two years now and I wear them almost every day for several hours. I have noticed recently that my AirPods have trouble holding a charge and they disconnect frequently from my devices (whether it be my iPhone, iPad, or MacBook) after a short period of time. They also have gone from 5 hours to wear to barely an hour with one charge. Is there a way for me to fix this or is it time for a new pair? And if I need a new pair, is it better to buy a whole new set (I would get the 2nd generation again) or just have them repair the AirPod pieces themselves (like bring them into an Apple store and have them repair the pieces but not the case)? Many thanks in advance!