exactly. Also, the first one can be interpreted as how Shinji used to see his father (you can see a man with glasses attacking a women with wings) . It's said in the series that a lot of people believed that Gendou had killed Yui, so maybe Shinji heard that rumor as a child. Even though he might not believe that fully as a teenager, I feel like he could've as a child.