The right solid lifter cam will work better.

But I think the shop that setup your heads for the hyd roller didn't do it right. It should rev to 6000 rpm without any problems. It can be made to rev higher, but it might not make power above that anyway. I have seen too many "shops" setup the heads wrong, wrong, wrong...

My engine is not an apples to apples comparison,
but I run a flat tappet solid lifter cam and 7000 rpm has never been an issue. I normally take it easy to 6800, but it has seen 7200 with the wrong gears in it before.