Stop and Go on the bubble....good or bad?

[Ben5505]

28 people left. Im 7th in chips with apprx 20k.

Hero is in SB.

Villian MP+1.

Villain had not been raising too many pots but a frequent amount since he had just been moved to table. He had around 38k in chips.

SB---600
BB---1200

Villain raises to 4200, Hero calls with AKo and intent to stop and go.

Flop--- 8 9 Q Rainbow and Hero pushes. My thoughts were that he really had to have a monster to call my all in right here and that since we were on the bubble his hand would need to be even stronger. Do you guys think I should have waited for a better spot or do you like this play?