Don't buy any lenses that need an adapter, and don't buy Nikons 35/2. That might be a decent suggestion if you were a PJ and this was 1997, but I doubt its either. Is there a reason you are replacing it? You said you 'might' need to.
As far as suggestions, I don't really recommend buying both, especially if you are trying to buy fast glass. The 35/1.4G will run you a nice $1650+. If I were you I would look into Sigma's version of both those lenses, either the 50/1.4 or the 30/1.4. Both are good lenses and can be had for a fraction of Nikons. I think the 30/1.4 comes around the same price as nikons 35/2 but gives you a stop and a half more, and actually handles CA way better than the Nikon.
Or if you are looking for a Nikon 35/1.8G, Im selling one, you can pm me and we can talk if you are interested.