godfish will do, but you could just do a fishless cycle. much easier i.m.o. and you wont have to make the goldfish suffer with the amonia spike. i find that tiger barb work awesome for starters and in your case you could keep them long term as a shoaling fish. i personally recomend 5 tiger barbs.