I like 12many’s suggestion. 230*@.050 (Hyd.) is as big as I would go and you’ll not have to change the converter.
The stock rockers are costing you lift. They are inaccurate. If you have the coin, I myself would use a 1.6. A 1.5 is fine. The 1.6 is just icing on the cake.
Id finish it off with a RPM.
That’s all I would do. It’ll be a nice street machine with chops.