I'm running 30s right now, just thought a new pair reworked from scratch for that setup would be better than what I have

To start, my suggestion is to install your -2 lowers and test with your existing B1 30P. Brett very likely can tune your existing props to put you spot on your targeted RPM. Originally we were running about 90 MPH with 25P Mirage @ 5" below the bottom and ended at 103 MPH with Bravo 1 28P @ 2" BTB. In our boat, both the Mercury and Herring 5-Blade props had too much transom lift and the boat was very light/loose with only +1 MPH with the Herrings and no additional speed with the Merc 5-blades. If you had all the test props, the Livingston channel would be a great place to test.:flag:

Do you notice your props coming out of the water a lot more with the shorter units? I don't really want to have to put on drive guardians this year although I probably will next year.

Absolutely, it is a all a trade off. This is a big project and the final cost can easily exceed whatever you budget. Also, more speed won't likely add much resale value to your boat.