Short story.
There were two domains site1.com and site2.com
site2.com registered in 97 and never expired.

Site2.com was a total copy of site1
They had similar pages of content (about 200 total pages).

Case1
I started to promote site2.com. I moved it to another hosting company at one point.
I ended up with about 200 pages that don't exist any more. I made 301 redirects to site1:

site2.com/page1.html -> 301 redirect -> site1.com/page1.html
and for all the other 199 pages :)

Case2
On site2 i needed to keep some navigation links that point to site1. I made internal redirects from site2.com/go.php?id=1 which point through 301 redirect to site1.com/some-category

I started to create pages with unique content on site2 and trade links.

My questions are:
I'm doing right in case1 and case2. ?
Maybe someone have other suggestions?