Try LFF9594, missed a key stroke on the part number.
There is nothing in that link that says you MUST remove the factory housing and filter, it is dated information that is basically incorrect. A big line kit will resolve any potential issues for high flow fuel systems.
The 98% of problems with FASS\AD install is nothing but scare tactics to sell parts and bad install advice. Those 98% bought into the marketing glitz at places like
http://pureflowairdog.com/manuals/A5SABD029.pdf and the myriad of places that say a draw straw outside the canister or a sump is the ONLY way to provide fuel. Sorry, proven fact that 98% of those concepts are total BS.
Many of us that have done the systems correctly know that and have stated it more than once. A lot of us are pushing thru 3 filters with an in-tank pump doing all it needs to provide more fuel and power than we need with top of the line filtration, in actual application better than AD's recommended solution.
With the fuel heater on the AD then you probably don't need another one inline. Just like the factory filter is an optional item, so is the fuel heater on the pumps. As long as you are operating where the average temps stay above 40 degrees then additional fuel heating is probably not needed. Sure would not hurt for the cooler days.
The FS1000 should go between the AD and the 1R filter, that is where it will be the most effective. Let the pump chew up the solids and separate as much water as possible then catch it downstream of the less efficient filter like the LFF9594, both are high flow filters so you will not lose anything in that position. Multi-pass filtration is the best known solution and you always go from high to low on the filtration scale in the fuel path.
As a further note, not doing that suspect AD pump any good with the sump either. Another downside to their recs. When it dies they sell you more parts, that is what they are in business for. Since you are already well down that road you have basically have to live with the drawbacks and the results.
I have never drained water from any WS I have had on multiple trucks nor seen a WIF light that wasn't in error. Just means the filters absorbed it and did their job. When water drains from the WS filters one is already well on the way to a screwed CR fuel system, all it really is validation you will be spending $$.