The only thing I'd like to talk you out of is buying new...I don't see that many B400's for sale around here, but Majesty 400's are fairly plentiful for well under $3K for a newish one. If you can possibly swing it, keep the KLR and pick up a used maxi.
When I got my Majesty, I also had an FZ1 and 2 smaller scooters. Ended up riding the 400 90% of the time- whether commuting or doing 500 mile days of twisties. The FZ1 was just stupid overkill in most cases. Now I have a DL650, the 400, and a CBR250. The DL and Maj get about equal time and the CBR comes out maybe 10% of the time (and waits patiently to be raced). The 400 has great weather protection, gets slightly better MPG and is invisible to cops but the suspension is harsh and handling is...weird. The DL rides like a Caddy and is more fun in the curves. I'm very glad to have options...