I'd stick to the side bags and dislocate blinkers, and maybe fit some cargo rack with pannier mounts.

Top case irresistibly invites you to finish him with a decisive "mawashi geri".