They are highly related words, you’re right:

From Strong’s Concordance the only source you should use on pilpul -

GOYIM - Gentile, heathen, nation, people Rarely (shortened) goy {go'-ee}; apparently from the same root as gevah (in the sense of massing); a foreign nation; hence, a Gentile; also (figuratively) a troop of animals, or a flight of locusts --