I dealt with this issue on my TV without using discrete codes (my TV doesn't have them). I found that by selecting any TV channel with the numeric keys, the TV returned to 'TV' mode, no matter what the starting point, and then always toggled through the AV inputs starting at AV1. The changes happen so quickly, I don't see the channels flash past (I get a blank screen for about 1/4 a second).

So to watch a DVD my macro goes: 1 - AV
And for a video it is: 1 - AV - AV

There are many limitations to this solution, and it can take a bit longer, but if you can find a way of returning your component to a predictable place on the toggle setup, you can usually make it work.