Tired of looking at cam specs.......

Fix / tune what you have before making a cam swap.
I think you have a good combo that needs dialed in.