What to do…What to do

So apparently the water cutting off isn’t an apartment issue it is a building issue, the building management worked on it Tuesday (why the water was off for half the day) and they are still working out the kinks.  Meanwhile out of the maybe 5 times I went to use the sink yesterday the water worked once…the other times it worked after a min. or so, but when you have hands full of soap that’s a problem.
The heating issue is my favorite.  I showed up at noon with lunch for Adam and his coworker (our hot water advocate).  The landlord bought a hot water tank that was to be installed in our bathroom it would be big and ugly…but hey I would have hot water.  When the repairman (the poor little man who came the day before) went to install it they found out that there was already a separate hot water heater for the shower.  Meanwhile the new heater fixed our hot water in the rest of the house issue and this explains why it wouldn’t fix our bathroom issue. 
OK, so we have had this separate heater since we have moved in and up until October (the last hot shower was right before we left for Japan on the 15^th) it worked fine.  Now they are telling me that because it has been cold for the past week that the pipes are getting cold and that is the problem.  I don’t buy it because: what about all the hot days (in the high 70’s at least) between October and last week?  The next reason they gave was that the issue with the water pump in the building was the problem.  If that is the problem why can I get hot water in the bathroom sink and in any other faucet in the house but not the shower in our bedroom?  And here is the kicker…why did it work 5 min before I entered the apartment and when they went to show me it didn’t work?  I am assured that everything will fix itself in 2 days.  Normally I am a trusting person and I like to think I have a positive attitude, but honestly I don’t know…
Here is what I am thinking about at 2:30 am when I should be sleeping: A) What if something breaks in a week again and we don’t find out until we get back from Australia.  B) My friend is moving out of her apartment in the beginning of Jan, we could move right in (she has kept it clean, the furniture is nice, it is 3 bedroom but a little smaller then our current place, and she has hot water consistently) She lives in the complex that would have been Adam and I’s first choice apartment wise but second choice location wise.  C) Say everything having to do with the water will work, what if we have another problem…will it take 2 months to fix because the Landlord isn’t local?  D) Moving would be a nightmare, but it would be an even bigger nightmare when I am huge or dealing with an infant.  E) Maybe this time people actually know what they are talking about and I won’t have another issue before we are scheduled to move back to the states (where I will appreciate a hot shower as often as my little boy allows).  F) What if we move and have issues at the next apartment…what next?  (The good thing is I know my friend hasn’t had any problems since she moved in back in April.)
So here is where I need help…should I risk staying in an apartment that we otherwise love and have settled into or should we move to another apartment knowing that the water works?  If we move, we need to do it now.  If we stay I really need to trust that when I turn on the shower it’s safe to put shampoo in my hair because the water won’t cut off and I won’t get goose bumps because the water isn’t hot.