Firstly I'd email
forgeworld@gwplc.com. It isn't ironclad or anything but they're usually better than
GW themselves for answering direct questions.
Concerning the question itself. It isn't clear
IMO. While the first sentence refers to "psykers" and "tests" and you only have permission to reroll one
D6 per Hullpoint (leading me to believe it is the first option). The second sentence refers to "the test" which would lead me to option two.
I'm a Chaos player and biased but while I'd prefer option two given the price of the upgrade and not to invalidate the Spell Familer, I would play it as option one.