it was actually neither, it was a movie exclusive guyver/zoanoid hybrid. The closest thing that he would've had in that movie to a girl knowing was Cori, and she fits the description he gave nicely...so...yeah, its probably guyver.
Oh, and I don't know what you're saying about the second being better than the first. Nothing can EVER beat rapping zoanoids and a guyver that can be taken out by even the most basic zoanoids around, that movie was a genuine classic! *kills self* Now I've gotta go and read a few issues of the real thing just to cleanse myself.