Yeah, your not wrong about the flat Tappets! I'm surprised I can't find a roller tappet kit but more moving parts mean more chance of failure!
I'm thinking about a fruitier Cam, it'd be rude not to whilst it's apart....
I have looked at new EEPROMs as well, not cheap but it should help release...