[size=78%]Personally mate, I reckon you've made the right decision![/size]
Now, as to your list:
Forks - I'd recommend taking the springs out, and checking them first. They'll have a code stamped on them. Find out what rate it is, and what weight that's good for, and then replace if its not right. Seems a bit pointless doing the oil - if you're not using all the travel the spring just isn't right for your weight at all - thicker oil would make it seem harder, but won't affect the travel.
Shock - I would also imagine if the front is too stiff the rear may also be. Take it off, send it to Nitron. Will cost about £100-£150, they can service it, respring it and revalve it for your weight, and then it will be completely sorted. Also worth noting you don't actually need dog bones - your shock is ride height adjustable. Better to use that first as it won't alter the linkage rate like dog bones will.
Grips - Soft renthals!