The Rick’s Restomod tank, GM Gen5 fuel module, and VaporWorx controller will work well with both setups.
Though a bit more expensive the Gen5 ZL1 fuel module will allow room for up to 750NA HP with no drawbacks when combined with the PWM controller. It will also handle up to 650 supercharged horsepower, so if the forced induction bug hits you're likely covered.
The PWM kit that should work well:
https://www.vaporworx.com/shop/product/pwzl13b-tm/
Helpful fittings that usually make installing the fuel pressure sensor into the fuel line easier:
https://www.vaporworx.com/shop/produ...outlet-kit-45/
Feel free to reach out at any time with questions.