Seems at first glance these are over budget. But you sell your pre and power and eliminate the power cord and IC you no longer need because you no longer have separates.
These will be a monster unbelievable huge upgrade, do everything you want, and net out in budget or if you go over, well worth it as they will be the foundation of your system for years to come.
I have the Herron. The Raven is a better version of my Melody.
https://systems.audiogon.com/systems/8367#&gid=1&pid=8