Well I went ahead and had the bike shop do the fork swap and boy am I glad I did. There were a couple of things that needed doing that I wouldn't have been able to do without the right tools so that right there saved me money. Anyway the guy was in a little bit of a hurry as the shop was very busy and there were only 2 people working there. I waited a couple of hours while he worked on and off on my bike which was OK.
When I got the bike home I went over it and made a few adjustments. After assembling the front disc brake to the new fork the mechanic failed to run the brake cable around the bottom of the cable holder and had readjusted the brake so much that the brake pads were continually rubbing on the disc. I readjusted the cable and also the stem riser and handle bars to my liking too.
The bike now has the suspension it needed to soak up the bumps and make riding a lot more comfortable. And It also looks fantastic!