4s battery pack, how to build?
Your second drawing would be OK for 4s2p connection.

Second BMS has maximum current better suited for your application. The one with 30A limit won't provide necessary protection.

Couple warnings:


If you want to charge battery pack with output regulator connected then better option would be to use embedded charger with power path technology. Regular charger cannot tell the difference between current consumed by the load and current charging the battery.
If you OK with not using the output while charging then you can wire the input to the charging jack with internal switch. The idea is to disconnect output regulator when you plug in the charger.
before assembling your battery pack run each cell individually through charge/discharge cycle. Select only closely matched cells for your application. Then fully charge all cells again, let them cool down, measure voltage and connect parallel pairs only with identical voltage. After that you can connect pairs into 4S string and attach BMS.