Have you considered a C adapter and running a p60 triple? Heatsinking should be improved with more mass from the p60 size.
I think the overall size would be slightly bigger but should still be relatively compact with a slim head. Also gives you options to use other p60 drop-ins if you are interested in that.