Do I keep r_π in the Thevenin circuit? Is the Thevenin resistance Rthev = Ri//Rb1//Rb2//r_π OR Rthev = Ri//Rb1//Rb2 + r_π ?
Answer: You put them all in parallel: \$R_{thev} = R_i//R_{b1}//R_{b2}//r_π\$
While \$r_π=h_{IE}\$
Input impedance across Vbe is defined as hie,
Where;
hfe : It is called the current gain aka \$\beta \$
hie : It is the internal resistance, hie=hfe/gm aka \$r_\pi\$
hre : It is called reverse voltage gain
hoe : It is the output resistance at emitter.
Let's compare a small signal diode incremental load ΔVf/If=Rd to a base-emitter diode in a small transistor.

\$h_{ie} \approx (hfe+1)*\frac{26mV}{Ie}=\dfrac{26}{Ib [mA]}\$ @ 25 'C
hie for input impedance of a common emitter with Re=0
2N3904
For some odd reason Plotting Hie , hfe for 2N3904 , has better matching for \$hie=30.5 hfe/Ic\$ otherwise 17% error. (k=30.5 vs k=26 temperature coefficient) , let hfe = hfe+1 for hfe >100

For the long answer, read Ian Getreau's book 1979 from Tektronix. But there is a simple approach for small non-saturated signals.
For an accurate answer compute hie from the datasheet and estimate tolerance.