Since Tempo has been out of business for several years and the replacement Moeller tanks have changed the area that used to allow tapping in an elbow for a return line, what suggestions are there for a replacement diesel tank? The boat is a '96 S23 cat-rig.