First Welcome to PC and you are not alone.

My first advice is always a candid assertive sit down conversation...sounds like that you've done that.

Go or Stay is a toughy...did you continue to be assertive about how his laughing makes you feel? This situation you describe may say something about how he views your relationship? Has it always been this way or is it something new? What was it like before he left for his military service?

If you find yourself saying to yourself it really has been this way pretty much the whole time...you may want to look at that carefully...