X-Wing 1.0 had a serious problem with players exploiting the rules around bumping. The concept of castling was born out of this exploitation. Intentionally bumping your own ships should have negative consequences. Just losing an action is not enough and isn't consistent anyways. So I propose the following fix for x-wing 2.0.
QuoteAfter a ship bumps, that ship gains a stress token. Do not remove a stress token for blue maneuvers.
It is still possible to do castling; however, the player will be punished with stress tokens. Players will no longer have the option to exploit bumping to remove stress while keeping their ships 'in place'.
Punishing bumping with a stress, promotes 'good flying'. Good flying is not bumping into ships (even though some of you will argue otherwise).

