One of my coworkers has a Warrior and I think that thing looks fuggin' tight.
Other than the Shadow, there's always the Nighthawk 750 if you want a truly upright seating position.

h:
For Yamaha, you could always consider a used V-Star or something.
Then there's always the other Japanese makes. They all seem to be cheaper than HD's.
I guess I should say that I haven't ridden any of these bikes except for a Nighthawk 250 though. :exnbp: Good luck with your search.