Replacing a broken HS805 with a Blue Bird BMS-L530MG in the bicep. Its available at 20 Eu from hobbyking. Almost same specs but a bit shorter. It’s easy to remove the pot as it has a floating controller board. Downside is it has a smaller servo horn and so the rigid plate connector included with the HS805 does not fit.
You can find the adjusted servo holder here: http://www.thingiverse.com/thing:1654685
Be careful with the bicep installation – it’s rather difficult to get the rotations figured out the right way. Do not test with inserted piston – it will break things easily!