Whichever option is more convenient.
TSA has your implied consent to search your bags and certainly to open them. Would have been nice if someone had told you. If you want, you could send a note to TSA on the website and make the point that it would be a simple courtesy for the Officer to have told you that he pulled your laptop so that you would know to watch for it coming through after your bag.