"WouId it be possible that there is an issue at the gfi causing this? My understanding is that the white, green, black hot wires are coming from there."

Now I'm confused. if your two wire is bringing in the power than your 3 wire would then be your switch legs. Therefore the black spliced jumper is wrong. Unless I'm missing something, you need to verify which is your power supply.