Davis was my alma mater. Nice to have another aggie join the ranks. That said, Davis is a cesspool of bike theft. I had a bike stolen every year I was there and I was a super senior (graduated in 5). Good thing they were all Sears and Target bikes. So if you can make due with the bike you have right now and it's not terribly uncomfortable, stick with it. Your feet should not be flat on the ground when you're on the saddle. That means it's too low and there go your knees. If leaning the bike a bit to avoid the top tube is working ok, just go with it for now. Especially if your reach is fine.