From your pictures i would definately keep the giant frame, it looks a much better frame than the CB.
I am suprised you don’t rate the disks on the giant. In general cable pull disks are better than V brakes. My girlfriend has Hayes Mx4 cable pull disks on her bike and they work pretty well.
Wheel wise i would keep the ones that are on the giant for 2 reasons they are disk equiped for upgrading later and with the 24 speed (8 speed rear) you would be able to upgrade to 9 speed at a later date.
Forks, yes both are made by SR Suntour but the ones on the Giant look more modern. They will probably have different internal, ride both bikes and see which feel better. A little chain oil on the stantions of the current giant forks should help them feel a little smoother.
Basically what i am suggesting is try to sell the CB and then spend what ever you have set aside and proceeds to primarilly get the giant up and running (some new or new to you shifters and mechs) then upgrade as and when you can.