My house was totally re piped @ 4 months ago,and with that re pipe i decided to get a new water heater to (whirlpool "low boy" 30 gal capacity) no bells and whistles just your basic electric HWH. CPVC was used for the hot and cold sides inside the house tub/shower,bathroom sink,toilet and kitchen sink. The HWH is located in the kitchen and the hot and cold lines coming from it run along the kitchen wall under a counter top,and proceed out an exterior wall where @ 15' of pipe hot and cold runs underground and @ two 3' portions run along the outside of an exterior wall. All hot and cold lines either exposed or underground are foam stick insulated. Now the question. It takes a good 30+ seconds to get hot water when the tub or any sink faucet is turned on. Should i change the underground hot line portion to copper?,re trench the hot line and cover it with more insulation? turn up the thermostat on HWH... Advice,suggestions and remedys welcome.Thanks all!