Phillip only met Elizabeth in 1939, he was put in charge of entertaining the King's two daughters while the King and Queen toured Dartmouth Naval College, as their parents were close friends.
Both parents viewed Philip as an acceptable match for Elizabeth, however with her dying in 1940, i believe there would be an agreement for Philip to eventually marry Margaret at a after the war. Maybe not before George dies, but they'd certainly be engaged by then.