Yeah I guess there is no right or wrong answer here, if you can wait and are patient, then you might get a nice reward in terms of a much better phone. But if you want to enjoy a fantastic phone right now, then you can't go wrong with the N4.
I was using an htc desire before getting the N4. About two months or so before the N4 came out, I couldn't charge the phone through usb anymore so I had to remove the battery and plug it in a universal charger every time, several times a day. The charge wouldn't last very long, and the phone was acting up because of the absence of battery for so long while it was charging. Still I'm glad I kept my crappy htc and waited for N4 to come up rather than getting a Gnex.