What is the proper way of doing this? Is there some option to tweak or maybe i just add another receiver on the end of transaction with
Myoriginaladdress, !
When I want to get the change in a spending address instead of change address, I also use successfully <address>,!
I find it as good option as any.
Another direction should be to uncheck in preferences the use of change addresses; I've never used this option, but it looks designed for your use case.
PS. If you have Advanced Preview enabled, you can take a look onto the transaction before broadcasting; it may help, to be sure.