>So I've got myself a 2 year window to get comfortable with Java, if I want to stay here, or .Net.
You really cannot lose with knowledge of JAVA. Go for it. .NET isn't fully mature anyway. When I was in Texas, I asked some people which language was the ONE that was in high demand; the answer was JAVA. I asked about .NET and there was some activity with it, but JAVA was king; this was only a few months ago. I'd go with JAVA for the next 2 or so years.
In my case, I've already had some C#.NET training and have been looking at VB.NET. Unfortuantely, there is not any work among our clients for JAVA or .NET yet. The only work we have is with Visual FoxPro. So far, so good. Still, I will increase my knowledge of .NET development products in order to be a little moee ready when the work does come, or we find it.
FoxPro is NOT dead yet!!!
This is my own opinion: I think you are in an ideal situation and cannot lose with JAVA knowledge and experience to boot.