So .. if you keep the bike you have and wait on the bagger for a while I have 2 suggestions that might make riding a little more fun for you.
1. A backrest .. best money I ever spent on any motorcycle was a backrest.
2. Handlebars .. I am thinking that you might want something with a slightly larger rise and some extra pullback.
That way you can settle into the backrest, get comfortable and not be arching forward the way is looks in the pictures.
Of course eventually you will end up on a bagger.. someday. And it doesn't need to be a new one and it doesn't need to be a CVO.
Best of luck, ride hard and keep the rubber on the road.
DH