Yes it is worth it.Period. Even if you can't do CNC now even a good race valve job and some hand porting can make a noticeable difference in the right hands.Concentrate on the low and mid lifts more so than peak. The cam upgrade you mentioned would likely pick up some power as well.