Most would say NEVER re-pot when in bloom. Remember these plants are epiphytes so they don't require any media technically.
The plant has adjusted to the conditions it finds itself and will take months to re-adjust if you change anything you describe.
When its done blooming, snip the spikes and do a re-pot, not before.