Criss Waddle to contest as MP