Do I have to wait for both the trade protection and trade lock timers separately?

No, the trade protection and trade lock timers run concurrently, not separately. This means you won’t need to wait 7 days for trade protection and then another 7 for the trade lock.