An update for the fish fans here.
My 2 goldfish have gone to my neighbour's house...they have a huge natural pond and a 5-6 foot tank indoors. I'm very happy about this, as I don't have to worry about them not having enough space here. They were so friendly and I was having a hard time to part with them, but they are in paradise now with experienced fish people.
Thanks so much for all the great advice given to me here, hopefully in the fall I can start a set up for a couple of guppies, or neons.