Christian help for morals about before marriage?

So I messed up and lost my virginity with this other girl that was a virgin but then things didn't work out and we broke up. Since then I went through my troubles and whatnot but I have become a devout christian. When I get into a relationship, should I wait until marriage for still? Even though I already lost my virginity? I mean I guess I really do want to but I know that my drive will really want it. Is , or hand jobs okay?