It takes too long to get hot water at our shower. I have Model RF250T6 which clearly states it has "heat traps". I was going to purchase a recirculating motor but was told by the manufacturer (Watts) it does not work with your water heater since it has the heat traps. If I remove the heat traps was told it voids the warranty. How do I get my hot water quicker at the shower? Now it takes 5 mins which is intolerable.