Did you like the bike? If so, then waiting for parts is a brief blip in time.
Get the bike you want but it seems a short to not buy another R3T due to parts delay. Yea, I waited too,and it was a pain-but it's done and I still have great bikes form Triumph.
If it's really that critical the the H-D store has everything anyone could possible want-and then some. But it all boils down to the basic bike itself. Did you like it enough to buy another? And as you mentioned, they now come loaded up to a fair degree-no waiting there!
Glad you're Ok-crashing really stinks.