Should I make the swap to G3?

Hell, if that's all we're worried about, go slant 6. They'll take 30 plus PSI and not even breathe hard. lol
Not without studs, o ringing the deck, and using the proper head gasket. But you’ll get to 30 psi real quick because the head is such a restriction. I’ve yet to see one live a while on more than 12 psi.