OK, changed out the Napa fuel and fuel/water filters this evening for the correct Fleetguard ones and all seems back to normal. Went for a 20 mile ride and the engine pulls like it used to and the transmission now shifts up over 2K, where it used to. Thanks to my son and his buddy who has a diesel truck for their help and for all the forum members who helped diagnose the problem. I've never posted a question here that someone hasn't had either the answer to or at least a good place to start. You guys are the best.