I've got a Bosch 040 pump which I was given a while ago and it came with an APS bracket from an xr6t kit, it looks like it would hang quite nicely in the void where the drop tank was removed from.
I don't want to have to engineer the fuel system so I think it'll be close enough to a factory option tank to argue. Adding a surge tank or fuel cell requires certification under NCOPS and my old drop tank was leaking like a sieve.
I'll add a pic or two to my project thread, it's a simple enough bracket to copy