Dave, go with your gut and wait. I'd even call Diamond and have them recommend other shops in your area that carry their stuff, call them and see if they have a hornet you can shoot, then go shoot it. I think based on what you typed you will love it. If you decide to buy, ask them to match the price you already have quoted by their competition.
I suspect if you buy either of the two bows you shot, you will have nagging regrets and buyers remorse. Thanks for the report, and good luck