tank->pump->surge tank->pump->fuel rail is correct.
The standard pick up with the strainer is fine.
You can run the lift pump in tank or external to tank. I had a pump in the tank so I left it there and is now my lift pump. If you don't have one in tank, it's usually easiest to have an external lift pump.