Let's put this in perspective:

If you were an individual with an open or concealed carry and had a handgun on at the time and you shot and killed this man because he pulled a fake gun on you.... You wouldn't even have done jail time and would be legally justified to defend yourself.

If your girlfriend was going about this intelligently she'd break contact with him on her own.

You did nothing wrong.