Your incidence angles sound right on. But when measuring you should “0” out the tail first, this is how your plane will set in the air at its intended cursing speed. Two degrees of angle of attack on the main wing is “right on” for a nice relaxed cursing speed. It sounds to me you just like to fly faster. Aerobatic aircraft are usually set to 0-0-0, one reason for this is so they can fly upside down with no change in the trim and aerobatic planes more then likely have a more symmetrical airfoils.
Before changing the incidence of the main wing you should really check your balance first and maybe change it to see what happens, it maybe a little tail heavy. If it balances out ok then you can adjust the main wing incidence angle to soot your preferred speed range.
Remember that you control the plane’s altitude with the throttle “not the elevator”.