Next step forward for my engine

You have a pretty good combo now, the only N/A way to get more power is more airflow. You could try to squeeze more out of your combo with more cam with a sacrifice to bottom end. Or through better flowing heads, hydraulic roller would mainly give advantage to ported or aftermarket heads cause of the extra flow at higher lifts, plus you can keep duration relatively small for a more street friendly package.