Buy a 40X RF action and have Davis mount a Lilja tightbore barrel. You can use the same trigger, rail and sights as you do now. I'm pretty sure the stock should fit too (short action), depending on what you do with the recoil lug.
I built a similiar 40X RF in a Masterclass stock with a Jewel...