well, it sounds to me as if you have some opposing wants from this engine... and a bit of a mismatch set up currently. High rpm screamers are tough to get fuel economy out of. I agree, solid cams are most excellent, I've got one custom ground by cam research in colorado for my stroked W, but, hydraulics are more convenient for the street.
The open champer head / domed piston concern brought up previously is certainly a valid one that could be leading to your tendency to detonation, which is never a good thing. But, short of pulling the engine to make major changes, you're not going to fix that.
As with any project it depends on money and time, how much of each are you willing to put into improvements?
I think your idea to measure your current cam is a great place to start, at least then you'll know what you have and can decide where to go from there.