the highlights would definately help. I suggest painting them on a separate layer in pure white. Then set the layer to 'screen' or 'brighten' and adjust opacity to taste. THat will give you more control over editing them. Same for shadows, if you haven't done that already, I mean