Funny how this keeps coming up, but TBDMS will work like a champ. Use ~equimolar TBDMS-Cl with 2.1 eq imidazole as a catalyst/acid scavenger. Water workup, maybe run a little hexane column to separate out the siloxane dimer if some shows up. And it should hydrolyze in HCl afterwards, though something like TBAF is probably faster.
God I love TBDMS protection, easily my favorite reaction.