Yes, I meant Method 2 (I corrected that).
I think the dataset "Mode" command does not quite work the same way as the original remote TV toggle button. You could teach your TV toggle command from the original remote under a new name like TunerToggle and use it in the Clone input setup. Then the extra command at the end of the activity would not be required. However, you may have to teach your TunerToggle command in RAW mode. This will require more work and more testing. It's up to you since you got it working already with the funny "Mode" command.