Help with business structure for small rental/flipping business

Hi.  I have been flipping 4-8 properties per year.  Some with partners and some on my own.  In addition, I have a bunch of rentals with a partner.  I am looking at other partnerships.  I would like to structure a more formal business entity to run my rentals, legal protection for my rentals, a separate structure for my flips and possibly something to allow a solo 401K.

I am local in Phoenix Arizona and have been doing everything under my personal name other than an LLC my partner and I use to manage our joint rentals.

I am looking for a local referral (lawyer or business consultant or tax consultant) if possible but would also work with an expert out of state.

Thanks!