Does this satisfy §172.704 + §177.816 fully?

Yes for §172.704(a)(1)–(a)(4) and §177.816(a). Cargo-tank drivers (≥1,000 gallons) also need §177.816(b) specialized training, which your carrier provides separately.