Which do you like better? It's not like it's a decision you'll have to stick with forever. If you cut it, it'll grow back easily.
You still have your memories of being here the first time, so I'd probably still count that time? It's like when we get memories from home - we don't technically or physically live that period, but we're still older.